From: Bruno Haible Date: Wed, 8 Jan 2003 14:04:10 +0000 (+0000) Subject: Regenerated. X-Git-Tag: v0.12~1192 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c5ed5d978b18eb84f2abf4299970022cea84d00;p=thirdparty%2Fgettext.git Regenerated. --- diff --git a/Makefile.in b/Makefile.in index 28501960a..3a411842f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.2 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,67 +14,61 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CLASSPATH = @CLASSPATH@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CROSS_COMPILING = @CROSS_COMPILING@ CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ DVIPS = @DVIPS@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EMACS = @EMACS@ EXEEXT = @EXEEXT@ GCC = @GCC@ @@ -97,8 +92,11 @@ HAVE_JRE = @HAVE_JRE@ HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@ HAVE_JVIEW = @HAVE_JVIEW@ HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@ -HAVE_LIB = @HAVE_LIB@ +HAVE_LIBEXPAT = @HAVE_LIBEXPAT@ HAVE__BOOL = @HAVE__BOOL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ @@ -109,28 +107,39 @@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ LD = @LD@ +LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ -LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ + +MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -OBJDUMP = @OBJDUMP@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ SUBDIR_libasprintf = @SUBDIR_libasprintf@ @@ -139,19 +148,50 @@ TEXI2PDF = @TEXI2PDF@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ YACC = @YACC@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ aclocaldir = @aclocaldir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ lispdir = @lispdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ with_gnu_ld = @with_gnu_ld@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ - gettextsrcdir = $(datadir)/gettext gettextsrc_DATA = ABOUT-NLS gettextsrc_SCRIPTS = config.rpath mkinstalldirs @@ -202,103 +242,99 @@ CONFIG_CLEAN_FILES = intl/Makefile SCRIPTS = $(gettextsrc_SCRIPTS) depcomp = +am__depfiles_maybe = DIST_SOURCES = DATA = $(gettextsrc_DATA) -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ - INSTALL Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \ - config.guess config.h.in config.sub configure configure.in \ - install-sh ltmain.sh missing mkinstalldirs ylwrap +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ + Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \ + config.guess config.h.in config.rpath config.sub configure \ + configure.in elisp-comp install-sh ltmain.sh missing \ + mkinstalldirs ylwrap all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/gcj.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/longdouble.m4 m4/longlong.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4 m4/wchar_t.m4 +$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/codeset.m4 m4/error.m4 m4/fixautomake.m4 m4/flex.m4 m4/fnmatch.m4 m4/gcj.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/longdouble.m4 m4/longlong.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4 m4/wchar_t.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-hT stamp-h -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in + +config.h: stamp-h1 @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in + touch $(srcdir)/config.h.in distclean-hdr: - -rm -f config.h + -rm -f config.h stamp-h1 intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ +gettextsrcSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-gettextsrcSCRIPTS: $(gettextsrc_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir) @list='$(gettextsrc_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(gettextsrcdir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(gettextsrcdir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(gettextsrcdir)/$$f; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(gettextsrcSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \ + $(gettextsrcSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f; \ else :; fi; \ done uninstall-gettextsrcSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(gettextsrc_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " rm -f $(DESTDIR)$(gettextsrcdir)/$$f"; \ rm -f $(DESTDIR)$(gettextsrcdir)/$$f; \ done + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +gettextsrcDATA_INSTALL = $(INSTALL_DATA) install-gettextsrcDATA: $(gettextsrc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir) @list='$(gettextsrc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f; \ + echo " $(gettextsrcDATA_INSTALL) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \ + $(gettextsrcDATA_INSTALL) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f; \ done uninstall-gettextsrcDATA: @@ -316,7 +352,7 @@ uninstall-gettextsrcDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -336,7 +372,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -363,17 +399,27 @@ tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -384,51 +430,83 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/djgpp $(distdir)/intl $(distdir)/lib $(distdir)/man $(distdir)/misc $(distdir)/os2 $(distdir)/po $(distdir)/src - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(DIST_SUBDIRS); do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -446,42 +524,71 @@ distdir: $(DISTFILES) ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ --with-included-gettext \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distuninstallcheck: + cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(SCRIPTS) $(DATA) config.h @@ -500,6 +607,7 @@ install-am: all-am installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -507,7 +615,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -516,11 +624,8 @@ clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-recursive - -rm -f config.status config.cache config.log + -rm -f $(am__CONFIG_DISTCLEAN_FILES) distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ distclean-tags @@ -543,33 +648,44 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + uninstall-am: uninstall-gettextsrcDATA uninstall-gettextsrcSCRIPTS \ uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-libtool clean-recursive dist dist-all \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-gettextsrcDATA install-gettextsrcSCRIPTS install-info \ - install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-gettextsrcDATA \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive dist dist-all dist-gzip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-gettextsrcDATA \ + install-gettextsrcSCRIPTS install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ + tags-recursive uninstall uninstall-am uninstall-gettextsrcDATA \ uninstall-gettextsrcSCRIPTS uninstall-info-am \ uninstall-info-recursive uninstall-recursive @@ -591,19 +707,19 @@ html: cd doc && $(MAKE) html $(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.in cd $(srcdir)/tests/rpathx && automake Makefile -$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.in +$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.in $(srcdir)/m4/libtool.m4 cd $(srcdir)/tests/rpathx && aclocal -I ../../m4 $(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.in $(srcdir)/tests/rpathx/aclocal.m4 cd $(srcdir)/tests/rpathx && autoconf $(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.in cd $(srcdir)/tests/rpathy && automake Makefile -$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 +$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.in $(srcdir)/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 cd $(srcdir)/tests/rpathy && aclocal -I ../../m4 $(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.in $(srcdir)/tests/rpathy/aclocal.m4 cd $(srcdir)/tests/rpathy && autoconf $(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.in cd $(srcdir)/tests/rpathz && automake Makefile -$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 +$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.in $(srcdir)/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 cd $(srcdir)/tests/rpathz && aclocal -I ../../m4 $(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.in $(srcdir)/tests/rpathz/aclocal.m4 cd $(srcdir)/tests/rpathz && autoconf diff --git a/aclocal.m4 b/aclocal.m4 index 269ffc35c..37d20d48c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# generated automatically by aclocal 1.7.2 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,11 +11,30 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -24,62 +43,62 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - +AC_PREREQ([2.54]) -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,22 +108,125 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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 + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.7.2])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +270,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +312,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +373,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +435,35 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) # serial 4 -*- Autoconf -*- +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +475,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -271,7 +492,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -319,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc], if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type=$depmode @@ -333,8 +554,10 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -352,7 +575,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -367,30 +590,48 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +655,48 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -434,7 +709,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -444,7 +719,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -454,7 +729,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi @@ -464,23 +739,35 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,72 +776,38 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -# serial 3 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". - -AC_PREREQ([2.12]) - -AC_DEFUN([AM_CONFIG_HEADER], -[ifdef([AC_FOREACH],dnl - [ - dnl prepare to store our destination file list for use in config.status - AC_FOREACH([_AM_File], [$1], - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) - dnl and add it to the list of files AC keeps track of, along - dnl with our hook - AC_CONFIG_HEADERS(_AM_File, -dnl COMMANDS, [, INIT-CMDS] -[# update the timestamp -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h" -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS - m4_popdef([_AM_Dest])])],dnl -[AC_CONFIG_HEADER([$1]) - AC_OUTPUT_COMMANDS( - ifelse(patsubst([$1], [[^ ]], []), - [], - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl -[am_indx=1 -for am_file in $1; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done]) -])]) # AM_CONFIG_HEADER +# 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, or (at your option) +# any later version. -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(m4_regexp([$1], [^/.*]), -1, - [.], - m4_patsubst([$1], [^\(/\).*], [\1])), - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -]) # _AM_DIRNAME +# 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. + +AC_PREREQ([2.52]) + +# serial 6 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # flex.m4 serial 1 (gettext-0.11) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. @@ -4572,36 +4825,6 @@ AC_DEFUN([bh_C_SIGNED], fi ]) -# c-bs-a.m4 serial 4 (fileutils-4.1.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 Paul Eggert. - -AC_DEFUN([AC_C_BACKSLASH_A], -[ - AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a, - [AC_TRY_COMPILE([], - [ -#if '\a' == 'a' - syntax error; -#endif - char buf['\a' == 'a' ? -1 : 1]; - buf[0] = '\a'; - return buf[0] != "\a"[0]; - ], - ac_cv_c_backslash_a=yes, - ac_cv_c_backslash_a=no)]) - if test $ac_cv_c_backslash_a = yes; then - AC_DEFINE(HAVE_C_BACKSLASH_A, 1, - [Define if backslash-a works in C strings.]) - fi -]) - # ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -4741,7 +4964,7 @@ AC_DEFUN([gt_TYPE_SSIZE_T], fi ]) -# getline.m4 serial 5 (gettext-0.11) +# getline.m4 serial 6 (gettext-0.11.6) dnl Copyright (C) 1998-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 @@ -4749,6 +4972,8 @@ 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_PREREQ(2.52) + dnl See if there's a working, system-supplied version of the getline function. dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems dnl have a function by that name in -linet that doesn't have anything @@ -4790,12 +5015,11 @@ AC_DEFUN([AM_FUNC_GETLINE], dnl libgettextlib.so. AC_DEFINE([getline], [gnu_getline], [Define to a replacement function name for getline().]) - LIBOBJS="$LIBOBJS getline.${ac_objext}" - AC_SUBST(LIBOBJS) + AC_LIBOBJ(getline) fi ]) -# fnmatch.m4 serial 2 (gettext-0.11.1) +# fnmatch.m4 serial 3 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -4803,6 +5027,8 @@ 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_PREREQ(2.52) + dnl Determine whether the system has a working fnmatch() function. AC_DEFUN([gt_FUNC_FNMATCH], [ @@ -4841,8 +5067,7 @@ AC_DEFUN([gt_FUNC_FNMATCH], dnl libgettextlib.so. AC_DEFINE([fnmatch], [posix_fnmatch], [Define to a replacement function name for fnmatch().]) - LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}" - AC_SUBST(LIBOBJS) + AC_LIBOBJ(pfnmatch) fi ]) @@ -5512,6 +5737,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", fi fi + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then @@ -5674,13 +5915,16 @@ AC_DEFUN([AM_PO_SUBDIRS], # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then + if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi case "$ac_given_srcdir" in .) srcdirpre= ;; @@ -5745,7 +5989,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" ]) @@ -6544,7 +6788,7 @@ AC_DEFUN([AC_LIB_APPENDTOVAR], done ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -6575,6 +6819,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -6746,7 +7003,7 @@ size_t iconv(); fi ]) -# progtest.m4 serial 2 (gettext-0.10.40) +# progtest.m4 serial 3 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -6771,31 +7028,63 @@ dnl Ulrich Drepper , 1996. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl - ;; + ;; esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then @@ -7031,30 +7320,92 @@ AC_DEFUN([AM_LC_MESSAGES], ]) -# serial 3 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 6 + +# AM_PATH_LISPDIR +# --------------- AC_DEFUN([AM_PATH_LISPDIR], - [AC_ARG_WITH(lispdir, - [ --with-lispdir Override the default lisp directory ], - [ lispdir="$withval" - AC_MSG_CHECKING([where .elc files should go]) - AC_MSG_RESULT([$lispdir])], - [ - # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= - AC_CHECK_PROGS(EMACS, emacs xemacs, no) - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [dnl - am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'` - if test -z "$am_cv_lispdir"; then - am_cv_lispdir='${datadir}/emacs/site-lisp' - fi - ]) - lispdir="$am_cv_lispdir" - fi - fi - ]) - AC_SUBST(lispdir)]) +[AC_ARG_WITH(lispdir, + [ --with-lispdir Override the default lisp directory ], + [ lispdir="$withval" + AC_MSG_CHECKING([where .elc files should go]) + AC_MSG_RESULT([$lispdir])], + [ + # If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. + test x"$EMACS" = xt && EMACS= + AC_CHECK_PROGS(EMACS, emacs xemacs, no) + if test $EMACS != "no"; then + if test x${lispdir+set} != xset; then + AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], + [# If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly + # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, + # which is non-obvious for non-emacs users. + # Redirecting /dev/null should help a bit; pity we can't detect "broken" + # emacsen earlier and avoid running this altogether. + AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) + am_cv_lispdir=`sed -n \ + -e 's,/$,,' \ + -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \ + conftest.out` + rm conftest.out + if test -z "$am_cv_lispdir"; then + am_cv_lispdir='${datadir}/emacs/site-lisp' + fi + ]) + lispdir="$am_cv_lispdir" + fi + fi +]) +AC_SUBST(lispdir) +])# AM_PATH_LISPDIR + +AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR]) + +# fixautomake.m4 serial 1 (gettext-0.11.6) +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 + +dnl Fix unesthetic build commands generated by automake. +AC_DEFUN([FIX_MAKEFILE_COMPILE], [ + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $1 > $1.tmp + mv $1.tmp $1 +]) + +dnl Fix an automake-1.5-1.7.2 bug: the distrib rule is omitted. +AC_DEFUN([FIX_MAKEFILE_DISTRIB], [ + sed -e 's,^#distdir:,distdir:,' < $1 > $1.tmp + mv $1.tmp $1 +]) + +dnl Fix an automake-1-5.1.7.2 bug: all info files are erased by "make". +AC_DEFUN([FIX_MAKEFILE_INFO], [ + sed -e '/@rm -f \$''@/d' < $1 > $1.tmp + mv $1.tmp $1 +]) diff --git a/config.h.in b/config.h.in index 813cfb790..9bbc7e86f 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated from configure.in by autoheader. */ /* Default value for alignment of strings in .mo file. */ @@ -13,7 +13,7 @@ #endif -/* Define if the `closedir' function returns void instead of `int'. */ +/* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP @@ -21,7 +21,7 @@ */ #undef CRAY_STACKSEG_END -/* Define if using `alloca.c'. */ +/* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA /* Define to 1 if libexpat shall be dynamically loaded via dlopen(). */ @@ -31,21 +31,19 @@ language is requested. */ #undef ENABLE_NLS -/* Define if you have `alloca', as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ #undef HAVE_ALLOCA_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H -/* Define if backslash-a works in C strings. */ -#undef HAVE_C_BACKSLASH_A - /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT @@ -54,13 +52,14 @@ */ #undef HAVE_DECL_WCWIDTH -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_DIRENT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define if you don't have `vprintf' but do have `_doprnt.' */ +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT /* Define if you have the declaration of environ. */ @@ -72,61 +71,61 @@ /* Define to 1 if you have the functions error() and error_at_line(). */ #undef HAVE_ERROR_AT_LINE -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define if you have the `feof_unlocked' function. */ +/* Define to 1 if you have the `feof_unlocked' function. */ #undef HAVE_FEOF_UNLOCKED -/* Define if you have the `fgets_unlocked' function. */ +/* Define to 1 if you have the `fgets_unlocked' function. */ #undef HAVE_FGETS_UNLOCKED /* Define if you have and a working fnmatch() function. */ #undef HAVE_FNMATCH -/* Define if you have the `fork' function. */ +/* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK -/* Define if you have the `getcwd' function. */ +/* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define if you have the `getc_unlocked' function. */ +/* Define to 1 if you have the `getc_unlocked' function. */ #undef HAVE_GETC_UNLOCKED -/* Define if you have the `getdelim' function. */ +/* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM -/* Define if you have the `getegid' function. */ +/* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID -/* Define if you have the `geteuid' function. */ +/* Define to 1 if you have the `geteuid' function. */ #undef HAVE_GETEUID -/* Define if you have the `getgid' function. */ +/* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID -/* Define if you have the `gethostbyname' function. */ +/* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME -/* Define if you have the `gethostname' function. */ +/* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME -/* Define if you have the `getpagesize' function. */ +/* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have the `gettimeofday' function. */ +/* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define if you have the `getuid' function. */ +/* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID /* Define if you have the iconv() function. */ #undef HAVE_ICONV -/* Define if you have the `inet_ntop' function. */ +/* Define to 1 if you have the `inet_ntop' function. */ #undef HAVE_INET_NTOP /* Define if exists and doesn't clash with . */ @@ -139,13 +138,13 @@ /* Define if defines AF_INET6. */ #undef HAVE_IPV6 -/* Define if you have the `isascii' function. */ +/* Define to 1 if you have the `isascii' function. */ #undef HAVE_ISASCII -/* Define if you have the `iswcntrl' function. */ +/* Define to 1 if you have the `iswcntrl' function. */ #undef HAVE_ISWCNTRL -/* Define if you have the `iswprint' function. */ +/* Define to 1 if you have the `iswprint' function. */ #undef HAVE_ISWPRINT /* Define if you have and nl_langinfo(CODESET). */ @@ -157,85 +156,85 @@ /* Define if you have the expat library. */ #undef HAVE_LIBEXPAT -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define if you support file names longer than 14 characters. */ +/* Define to 1 if you support file names longer than 14 characters. */ #undef HAVE_LONG_FILE_NAMES -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H -/* Define if you have the `mblen' function. */ +/* Define to 1 if you have the `mblen' function. */ #undef HAVE_MBLEN /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #undef HAVE_MBRTOWC -/* Define if you have the `mbsinit' function. */ +/* Define to 1 if you have the `mbsinit' function. */ #undef HAVE_MBSINIT -/* Define if you have the `memcpy' function. */ +/* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if you have the `mempcpy' function. */ +/* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY -/* Define if you have the `memset' function. */ +/* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define if you have the `mkdtemp' function. */ +/* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define if you have a working `mmap' system call. */ +/* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP -/* Define if you have the `munmap' function. */ +/* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_NL_TYPES_H -/* Define if you have the `pathconf' function. */ +/* Define to 1 if you have the `pathconf' function. */ #undef HAVE_PATHCONF /* Define to 1 if you have the sigset_t type and the sigprocmask function. */ #undef HAVE_POSIX_SIGNALBLOCKING -/* Define if you have the `posix_spawn' function. */ +/* Define to 1 if you have the `posix_spawn' function. */ #undef HAVE_POSIX_SPAWN -/* Define if the system has the type `ptrdiff_t'. */ +/* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T -/* Define if you have the `putc_unlocked' function. */ +/* Define to 1 if you have the `putc_unlocked' function. */ #undef HAVE_PUTC_UNLOCKED -/* Define if you have the `putenv' function. */ +/* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV -/* Define if you have the `raise' function. */ +/* Define to 1 if you have the `raise' function. */ #undef HAVE_RAISE -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SEARCH_H -/* Define if you have the `select' function. */ +/* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT -/* Define if you have the `setenv' function. */ +/* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV -/* Define if you have the `setlocale' function. */ +/* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE /* Define to 1 if defines the siginfo_t type, and struct sigaction @@ -245,140 +244,145 @@ /* Define if you have a working header file. */ #undef HAVE_STDBOOL_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDDEF_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define if exists, doesn't clash with , and declares uintmax_t. */ #undef HAVE_STDINT_H_WITH_UINTMAX -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if you have the `stpcpy' function. */ +/* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY -/* Define if you have the `strcasecmp' function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define if you have the `strcspn' function. */ +/* Define to 1 if you have the `strcspn' function. */ #undef HAVE_STRCSPN -/* Define if you have the `strdup' function. */ +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the `strerror' function. */ +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have the `strncasecmp' function. */ +/* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP -/* Define if you have the `strpbrk' function. */ +/* Define to 1 if you have the `strpbrk' function. */ #undef HAVE_STRPBRK -/* Define if you have the `strstr' function. */ +/* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR -/* Define if you have the `strtoul' function. */ +/* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_DIR_H -/* Define if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ #undef HAVE_SYS_NDIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_TIME_H -/* Define if you have the `tsearch' function. */ +/* Define to 1 if you have the `tsearch' function. */ #undef HAVE_TSEARCH -/* Define if you have the `uname' function. */ +/* Define to 1 if you have the `uname' function. */ #undef HAVE_UNAME /* Define if defines the 'union wait' type. */ #undef HAVE_UNION_WAIT -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the `unsetenv' function. */ +/* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV /* Define if you have the unsigned long long type. */ #undef HAVE_UNSIGNED_LONG_LONG -/* Define if you have the `utime' function. */ +/* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME -/* Define if you have the `utimes' function. */ +/* Define to 1 if you have the `utimes' function. */ #undef HAVE_UTIMES -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define to 1 if you have the header file. */ #undef HAVE_VALUES_H -/* Define if you have the `vasprintf' function. */ +/* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF -/* Define if you have the `vfork' function. */ +/* Define to 1 if you have the `vfork' function. */ #undef HAVE_VFORK -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H -/* Define if you have the `vprintf' function. */ +/* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF -/* Define if you have the `waitpid' function. */ +/* Define to 1 if you have the `waitpid' function. */ #undef HAVE_WAITPID -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_WCTYPE_H -/* Define if you have the `wcwidth' function. */ +/* Define to 1 if you have the `wcwidth' function. */ #undef HAVE_WCWIDTH -/* Define if `fork' works. */ +/* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK -/* Define if `vfork' works. */ +/* Define to 1 if `vfork' works. */ #undef HAVE_WORKING_VFORK -/* Define if you have the `__argz_count' function. */ +/* Define to 1 if you have the `__argz_count' function. */ #undef HAVE___ARGZ_COUNT -/* Define if you have the `__argz_next' function. */ +/* Define to 1 if you have the `__argz_next' function. */ #undef HAVE___ARGZ_NEXT -/* Define if you have the `__argz_stringify' function. */ +/* Define to 1 if you have the `__argz_stringify' function. */ #undef HAVE___ARGZ_STRINGIFY -/* Define if you have the `__secure_getenv' function. */ +/* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV /* Define as const if the declaration of iconv() needs const. */ @@ -390,6 +394,21 @@ /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + /* Define if exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN @@ -404,10 +423,10 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define if the `S_IS*' macros in do not work properly. */ +/* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ diff --git a/configure b/configure index e3a6b7dd6..8972eefc1 100755 --- a/configure +++ b/configure @@ -1,11 +1,244 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.57. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -18,6 +251,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -163,81 +397,7 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# 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" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +410,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,6 +422,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="src/msgfmt.c" # Factoring default headers for most tests. ac_includes_default="\ @@ -299,6 +468,8 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all libasprintf" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEX_OUTPUT_ROOT GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB LIBTOOL HAVE__BOOL STDBOOL_H ALLOCA LIBOBJS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING CXX CXXFLAGS SUBDIR_libasprintf GCC LD with_gnu_ld LTALLOCA subdirs LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -338,13 +509,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -477,7 +641,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -656,7 +820,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -668,18 +832,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -695,13 +860,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -711,13 +886,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -774,7 +952,7 @@ ac_cv_env_CXXFLAGS_value=$CXXFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -926,31 +1124,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -969,52 +1167,97 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. -done - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, -{ + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +{ (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) @@ -1027,21 +1270,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1054,6 +1329,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -1065,9 +1367,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1068: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1076,7 +1378,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1079: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1084,7 +1386,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1087: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1100,42 +1402,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1103: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1107: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1113: 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:1115: 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:1117: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1136: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1138: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1146,27 +1448,26 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1158: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1161: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + + +am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1184,7 +1485,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1187: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1204,43 +1505,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1207: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1253,7 +1559,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1256: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1264,7 +1570,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1267: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1288,7 +1594,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1291: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1301,13 +1607,13 @@ then # Ok. : else - { { echo "$as_me:1304: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1310: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1322,8 +1628,9 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL @@ -1331,16 +1638,15 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - { echo "$as_me:1335: WARNING: ${am_backtick}missing' script is too old or missing" >&5 -echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1343: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1348,41 +1654,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1358: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1366: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1369: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1376: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1393,98 +1702,163 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1396: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1400: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - -# test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + # test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1436: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + # Define the identity of the package. -PACKAGE=gettext -VERSION=0.11.6-pre2 + PACKAGE=gettext + VERSION=0.11.6-pre2 + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. +# Some tools Automake needs. -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -# Some tools Automake needs. +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + STRIP=$ac_ct_STRIP +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. -RELEASE_DATE=2002-08-06 - ac_config_headers="$ac_config_headers config.h" + +RELEASE_DATE=2002-08-06 ac_config_headers="$ac_config_headers config.h" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1494,7 +1868,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1497: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1502,25 +1876,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1512: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1520: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1523: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1529,7 +1906,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1532: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1537,25 +1914,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1547: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1555: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1558: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1568,7 +1948,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1571: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1576,25 +1956,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1586: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1594: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1597: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1603,7 +1986,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1606: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1611,25 +1994,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1621: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1629: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1632: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1642,7 +2028,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1645: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1651,20 +2037,23 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1665: found $ac_dir/$ac_word" >&5 -break -done +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -1675,19 +2064,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1687: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1690: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1698,7 +2085,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1701: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1706,25 +2093,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1716: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1724: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1727: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1737,7 +2127,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1740: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1745,25 +2135,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1755: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1763: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1766: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1775,33 +2168,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1778: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1783:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1786: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1789: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1791: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1794: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1796: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1799: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1803 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1812,100 +2212,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1819: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1822: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1825: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1848: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1854: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1859: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1865: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1868: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1875: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1883: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1890: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1892: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1895: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1897: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1900: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1913,26 +2333,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1916: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1922: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1928: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1934 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1943,40 +2369,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1949: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1961: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1968: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1972: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1978 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1990,41 +2423,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1996: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1999: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2002: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2014: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:2020: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2026 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2035,26 +2473,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2038: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2041: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2044: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2047: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2057: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2071,6 +2510,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2081,16 +2616,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2084: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2087: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2090: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2093: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2102,8 +2637,12 @@ if { (eval echo "$as_me:2084: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2105 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2115,27 +2654,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2118: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2121: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2124: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2127: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2137 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2146,21 +2690,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2149: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2152: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2155: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2158: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2173,7 +2718,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2181,8 +2727,19 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null + + + ac_config_commands="$ac_config_commands depfiles" -ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2190,9 +2747,9 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:2193: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -2202,7 +2759,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -2212,18 +2769,41 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi -echo "$as_me:2220: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + + depcc="$CC" am_compiler_list= -echo "$as_me:2226: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2270,7 +2850,7 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode @@ -2285,9 +2865,22 @@ else fi fi -echo "$as_me:2288: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2301,43 +2894,48 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2304: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -2350,7 +2948,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2353: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2365,7 +2963,7 @@ for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2368: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_YACC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2373,25 +2971,28 @@ else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_YACC="$ac_prog" -echo "$as_me:2383: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - echo "$as_me:2391: result: $YACC" >&5 + echo "$as_me:$LINENO: result: $YACC" >&5 echo "${ECHO_T}$YACC" >&6 else - echo "$as_me:2394: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2399,9 +3000,10 @@ fi done test -n "$YACC" || YACC="yacc" + # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -echo "$as_me:2404: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LEX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2409,15 +3011,18 @@ else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_LEX="flex" -echo "$as_me:2419: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="flex" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX=":" @@ -2425,16 +3030,24 @@ fi fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - echo "$as_me:2428: result: $LEX" >&5 + echo "$as_me:$LINENO: result: $LEX" >&5 echo "${ECHO_T}$LEX" >&6 else - echo "$as_me:2431: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + + LEX_OUTPUT_ROOT=lex.yy - echo "$as_me:2437: checking for Java to native code compiler" >&5 + + + + + + + echo "$as_me:$LINENO: checking for Java to native code compiler" >&5 echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6 # Search for the gcj command or use the one provided by the user. if test -z "$GCJ"; then @@ -2449,15 +3062,18 @@ else if test -n "$GCJ"; then ac_cv_prog_GCJ="$GCJ" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_GCJ="$ac_prog" -echo "$as_me:2459: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GCJ="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -2495,10 +3111,10 @@ public class conftest { } } EOF - { (eval echo "$as_me:2498: \"$ac_gcj_link\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_gcj_link\"") >&5 (eval $ac_gcj_link) 2>&5 ac_status=$? - echo "$as_me:2501: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } error=$? if test $error = 0 && test "$cross_compiling" != yes; then @@ -2514,7 +3130,7 @@ EOF else GCJ=none fi - echo "$as_me:2517: result: $GCJ" >&5 + echo "$as_me:$LINENO: result: $GCJ" >&5 echo "${ECHO_T}$GCJ" >&6 if test "$GCJ" != none; then HAVE_GCJ=1 @@ -2522,18 +3138,23 @@ echo "${ECHO_T}$GCJ" >&6 HAVE_GCJ= fi + + + if test -n "$HAVE_GCJ"; then BUILDJAVAEXE=yes else BUILDJAVAEXE=no fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2536: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2551,21 +3172,31 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2557 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if { (eval echo "$as_me:2562: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2568: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2579,7 +3210,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -2588,17 +3220,21 @@ 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 2591 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:2595: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2601: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2613,7 +3249,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -2635,28 +3272,38 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2638: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2648 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if { (eval echo "$as_me:2653: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2659: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2670,7 +3317,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -2679,17 +3327,21 @@ 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 2682 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:2686: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2692: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2704,7 +3356,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -2717,8 +3370,10 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2720: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -2728,11 +3383,32 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:2731: checking for Java compiler" >&5 -echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 2734 "configure" -#include "confdefs.h" + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + + + echo "$as_me:$LINENO: checking for Java compiler" >&5 +echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 + 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. */ #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ yes @@ -2740,7 +3416,7 @@ echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then + $EGREP "yes" >/dev/null 2>&1; then CLASSPATH_SEPARATOR=';' else CLASSPATH_SEPARATOR=':' @@ -2760,15 +3436,18 @@ else if test -n "$HAVE_GCJ_IN_PATH"; then ac_cv_prog_HAVE_GCJ_IN_PATH="$HAVE_GCJ_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_GCJ_IN_PATH="yes" -echo "$as_me:2770: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_GCJ_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -2789,15 +3468,18 @@ else if test -n "$HAVE_JAVAC_IN_PATH"; then ac_cv_prog_HAVE_JAVAC_IN_PATH="$HAVE_JAVAC_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_JAVAC_IN_PATH="yes" -echo "$as_me:2799: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JAVAC_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -2818,15 +3500,18 @@ else if test -n "$HAVE_JIKES_IN_PATH"; then ac_cv_prog_HAVE_JIKES_IN_PATH="$HAVE_JIKES_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_JIKES_IN_PATH="yes" -echo "$as_me:2828: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JIKES_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -2894,12 +3579,18 @@ EOF fi fi fi - echo "$as_me:2897: result: $ac_result" >&5 + echo "$as_me:$LINENO: result: $ac_result" >&5 echo "${ECHO_T}$ac_result" >&6 + + + + + + # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 -echo "$as_me:2902: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_JAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2907,25 +3598,28 @@ else if test -n "$JAR"; then ac_cv_prog_JAR="$JAR" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_JAR="jar" -echo "$as_me:2917: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_JAR="jar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi JAR=$ac_cv_prog_JAR if test -n "$JAR"; then - echo "$as_me:2925: result: $JAR" >&5 + echo "$as_me:$LINENO: result: $JAR" >&5 echo "${ECHO_T}$JAR" >&6 else - echo "$as_me:2928: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2935,11 +3629,17 @@ else BUILDJAVA=no fi - echo "$as_me:2938: checking for Java virtual machine" >&5 + + + echo "$as_me:$LINENO: checking for Java virtual machine" >&5 echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 2941 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ yes @@ -2947,7 +3647,7 @@ echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6 _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then + $EGREP "yes" >/dev/null 2>&1; then CLASSPATH_SEPARATOR=';' else CLASSPATH_SEPARATOR=':' @@ -2967,15 +3667,18 @@ else if test -n "$HAVE_GIJ_IN_PATH"; then ac_cv_prog_HAVE_GIJ_IN_PATH="$HAVE_GIJ_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_GIJ_IN_PATH="yes" -echo "$as_me:2977: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_GIJ_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -2996,15 +3699,18 @@ else if test -n "$HAVE_JAVA_IN_PATH"; then ac_cv_prog_HAVE_JAVA_IN_PATH="$HAVE_JAVA_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_JAVA_IN_PATH="yes" -echo "$as_me:3006: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JAVA_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -3025,15 +3731,18 @@ else if test -n "$HAVE_JRE_IN_PATH"; then ac_cv_prog_HAVE_JRE_IN_PATH="$HAVE_JRE_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_JRE_IN_PATH="yes" -echo "$as_me:3035: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JRE_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -3054,15 +3763,18 @@ else if test -n "$HAVE_JVIEW_IN_PATH"; then ac_cv_prog_HAVE_JVIEW_IN_PATH="$HAVE_JVIEW_IN_PATH" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_HAVE_JVIEW_IN_PATH="yes" -echo "$as_me:3064: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_JVIEW_IN_PATH="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi @@ -3101,22 +3813,30 @@ fi fi fi fi - echo "$as_me:3104: result: $ac_result" >&5 + echo "$as_me:$LINENO: result: $ac_result" >&5 echo "${ECHO_T}$ac_result" >&6 + + + + + + + if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then TESTJAVA=yes else TESTJAVA=no fi + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:3115: error: cannot run $ac_config_sub" >&5 + { { 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:3119: checking build system type" >&5 +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 @@ -3125,23 +3845,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:3128: error: cannot guess build type; you must specify one" >&5 + { { 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:3132: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:3137: result: $ac_cv_build" >&5 +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:3144: checking host system type" >&5 + +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 @@ -3150,19 +3871,22 @@ else 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:3153: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:3158: result: $ac_cv_host" >&5 +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo "$as_me:3165: checking for strerror in -lcposix" >&5 + + + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 if test "${ac_cv_lib_cposix_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3170,8 +3894,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3173 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3189,32 +3917,40 @@ strerror (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3195: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3198: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3201: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3212: result: $ac_cv_lib_cposix_strerror" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 if test $ac_cv_lib_cposix_strerror = yes; then LIBS="$LIBS -lcposix" fi + + + + + + + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -3292,6 +4028,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -3302,7 +4039,7 @@ fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:3305: checking for ld used by GCC" >&5 + 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*) @@ -3332,10 +4069,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:3335: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:3338: checking for non-GNU ld" >&5 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -3365,16 +4102,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:3368: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3371: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:3374: error: no acceptable ld found in \$PATH" >&5 +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:3377: checking if the linker ($LD) is GNU ld" >&5 +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 "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3386,23 +4123,24 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:3389: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:3393: checking for $LD option to reload object files" >&5 + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:3400: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:3405: checking for BSD-compatible nm" >&5 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3438,10 +4176,10 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:3441: result: $NM" >&5 +echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:3444: checking for a sed that does not truncate output" >&5 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3523,21 +4261,21 @@ if test "X$SED" != "X"; then else SED=$lt_cv_path_SED fi -echo "$as_me:3526: result: $SED" >&5 +echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 -echo "$as_me:3529: checking whether ln -s works" >&5 +echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3533: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3536: result: no, using $LN_S" >&5 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3540: checking how to recognise dependent libraries" >&5 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3718,13 +4456,17 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac fi -echo "$as_me:3721: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:3727: checking command to parse $NM output" >&5 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3808,17 +4550,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:3811: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3814: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:3818: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:3821: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -3870,10 +4612,10 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:3873: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3876: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -3914,138 +4656,460 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:3917: result: failed" >&5 + echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:3920: result: ok" >&5 + echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3927: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3933 "configure" -#include "confdefs.h" -#include <$ac_header> +#line $LINENO "configure" +/* confdefs.h. */ _ACEOF -if { (eval echo "$as_me:3937: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3943: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:3962: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +ac_cv_header_stdc=no fi -done +rm -f conftest.$ac_objext conftest.$ac_ext -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:3976: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/bin:$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <&2 +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$as_me:4031: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : else - echo "$as_me:4034: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cv_header_stdc=no fi +rm -f conftest* -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo "$as_me:4040: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +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. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in + /*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; + ?:/*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. + ;; + *) + ac_save_MAGIC_CMD="$MAGIC_CMD" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="/usr/bin:$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + egrep "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$ac_save_ifs" + MAGIC_CMD="$ac_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in + /*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; ?:/*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. ;; @@ -4092,10 +5156,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:4095: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:4098: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4111,7 +5175,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4114: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4119,25 +5183,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4129: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4137: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4140: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4146,7 +5213,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4149: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4154,15 +5221,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4164: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -4170,10 +5240,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4173: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4176: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4185,7 +5255,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:4188: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4193,25 +5263,28 @@ else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:4203: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:4211: result: $STRIP" >&5 + echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:4214: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4220,7 +5293,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:4223: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4228,15 +5301,18 @@ else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:4238: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" @@ -4244,10 +5320,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:4247: result: $ac_ct_STRIP" >&5 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:4250: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4256,8 +5332,9 @@ else STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no -enable_win32_dll=yes +enable_win32_dll=no # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then @@ -4271,11 +5348,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4274 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5 + echo '#line 5351 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4278: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -4296,12 +5373,13 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:4299: checking whether the C compiler needs -belf" >&5 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4309,8 +5387,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 4312 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4321,21 +5403,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4324: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4327: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4330: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4333: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4346,7 +5429,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:4349: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -4354,324 +5437,6 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 fi ;; -*-*-cygwin* | *-*-mingw* | *-*-pw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:4361: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -echo "$as_me:4376: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - echo "$as_me:4384: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 -else - echo "$as_me:4387: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -echo "$as_me:4396: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_DLLTOOL="dlltool" -echo "$as_me:4411: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:4420: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 -else - echo "$as_me:4423: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - DLLTOOL=$ac_ct_DLLTOOL -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:4435: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AS="${ac_tool_prefix}as" -echo "$as_me:4450: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - echo "$as_me:4458: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 -else - echo "$as_me:4461: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -echo "$as_me:4470: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_AS="as" -echo "$as_me:4485: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - echo "$as_me:4494: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 -else - echo "$as_me:4497: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - AS=$ac_ct_AS -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:4509: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -echo "$as_me:4524: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - echo "$as_me:4532: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 -else - echo "$as_me:4535: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -echo "$as_me:4544: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_OBJDUMP="objdump" -echo "$as_me:4559: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:4568: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 -else - echo "$as_me:4571: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - OBJDUMP=$ac_ct_OBJDUMP -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - echo "$as_me:4582: checking if libtool should supply DllMain function" >&5 -echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6 -if test "${lt_cv_need_dllmain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4588 "configure" -#include "confdefs.h" - -int -main () -{ -extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4601: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4604: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4607: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4610: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_need_dllmain=no -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_need_dllmain=yes -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:4620: result: $lt_cv_need_dllmain" >&5 -echo "${ECHO_T}$lt_cv_need_dllmain" >&6 - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - echo "$as_me:4629: checking how to link DLLs" >&5 -echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6 -if test "${lt_cv_cc_dll_switch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4635 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4647: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4650: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4653: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4656: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_cc_dll_switch=-mdll -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_cc_dll_switch=-dll -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:4666: result: $lt_cv_cc_dll_switch" >&5 -echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6 - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; esac @@ -4765,7 +5530,7 @@ fi set dummy $CC compiler="$2" -echo "$as_me:4768: checking for objdir" >&5 +echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -4776,9 +5541,11 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:4779: result: $objdir" >&5 +echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" @@ -4791,7 +5558,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:4794: checking for $compiler option to produce PIC" >&5 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4947,14 +5714,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:4950: result: none" >&5 + echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:4953: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:4957: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4962,8 +5729,12 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 4965 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4974,16 +5745,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4980: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4983: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4986: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -5003,7 +5774,8 @@ if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no fi @@ -5012,6 +5784,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no @@ -5019,23 +5792,23 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:5022: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:5028: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:5032: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:5038: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5044,8 +5817,12 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 5047 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -5056,30 +5833,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5062: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5065: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5068: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:5082: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -5089,8 +5868,9 @@ link_static_flag="$lt_cv_prog_cc_static" no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:5093: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5110,7 +5890,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -5134,12 +5914,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:5137: result: $compiler_c_o" >&5 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:5142: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5151,8 +5931,12 @@ else save_objext="$ac_objext" ac_objext=lo cat >conftest.$ac_ext <<_ACEOF -#line 5154 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -5163,16 +5947,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5166: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5169: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5172: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5175: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5184,7 +5968,8 @@ if { (eval echo "$as_me:5166: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" @@ -5193,7 +5978,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:5196: result: $compiler_o_lo" >&5 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no @@ -5203,7 +5988,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:5206: checking if we can lock with hard links" >&5 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -5211,10 +5996,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:5214: result: $hard_links" >&5 + echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:5217: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -5224,15 +6009,19 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:5227: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 5234 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -5243,16 +6032,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5246: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5249: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5252: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5255: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5264,11 +6053,12 @@ if { (eval echo "$as_me:5246: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:5271: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -5279,7 +6069,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:5282: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -5974,12 +6764,12 @@ EOF ;; esac fi -echo "$as_me:5977: result: $ld_shlibs" >&5 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:5982: checking how to hardcode library paths into programs" >&5 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -6003,20 +6793,20 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:6006: result: $hardcode_action" >&5 +echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo "$as_me:6011: checking whether stripping libraries is possible" >&5 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:6016: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:6019: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6024,7 +6814,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics -echo "$as_me:6027: checking dynamic linker characteristics" >&5 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -6443,17 +7233,17 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:6446: result: $dynamic_linker" >&5 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:6451: checking if libtool supports shared libraries" >&5 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:6453: result: $can_build_shared" >&5 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:6456: checking whether to build shared libraries" >&5 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 test "$can_build_shared" = "no" && enable_shared=no @@ -6474,14 +7264,14 @@ aix4*) fi ;; esac -echo "$as_me:6477: result: $enable_shared" >&5 +echo "$as_me:$LINENO: result: $enable_shared" >&5 echo "${ECHO_T}$enable_shared" >&6 -echo "$as_me:6480: checking whether to build static libraries" >&5 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:6484: result: $enable_static" >&5 +echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then @@ -6519,68 +7309,82 @@ else ;; *) - echo "$as_me:6522: checking for shl_load" >&5 + echo "$as_me:$LINENO: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6528 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -f = shl_load; +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != shl_load; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6559: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6562: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6565: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6568: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6578: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:6583: checking for shl_load in -ldld" >&5 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6588,8 +7392,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6591 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6607,93 +7415,108 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6610: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6613: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6616: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6619: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6630: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:6635: checking for dlopen" >&5 + echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6641 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -f = dlopen; +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != dlopen; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6672: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6675: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6678: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6681: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6691: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:6696: checking for dlopen in -ldl" >&5 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6701,8 +7524,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6704 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6720,32 +7547,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6723: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6726: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6729: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6732: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6743: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:6748: checking for dlopen in -lsvld" >&5 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6753,8 +7581,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6756 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6772,32 +7604,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6775: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6778: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6781: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6784: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6795: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:6800: checking for dld_link in -ldld" >&5 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6805,8 +7638,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6808 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6824,40 +7661,46 @@ dld_link (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6830: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6833: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6836: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6847: result: $ac_cv_lib_dld_dld_link" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + fi + fi + fi + fi + fi ;; @@ -6880,7 +7723,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:6883: checking whether a program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6891,7 +7734,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6958: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -6971,13 +7814,14 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:6975: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:6980: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6988,7 +7832,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7055: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -7068,8 +7912,9 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:7072: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -7090,6 +7935,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -7099,7 +7945,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:7102: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7107,10 +7953,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:7110: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7113: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -7124,10 +7970,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:7127: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:7130: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -7142,7 +7988,7 @@ else fi - echo "$as_me:7145: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -7702,6 +8548,10 @@ EOF chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -7710,59 +8560,75 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion -cat >>confdefs.h <<\EOF + + + +cat >>confdefs.h <<\_ACEOF #define _GNU_SOURCE 1 -EOF +_ACEOF -echo "$as_me:7717: checking for ANSI C header files" >&5 + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7723 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:7731: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7737: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f 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 7759 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -7774,13 +8640,17 @@ 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 7777 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -7795,14 +8665,19 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 7798 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -7821,57 +8696,112 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7824: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7827: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7829: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7832: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:7845: result: $ac_cv_header_stdc" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STDC_HEADERS 1 -EOF +_ACEOF fi -for ac_header in limits.h malloc.h string.h unistd.h values.h + + + + + + +for ac_header in limits.h malloc.h string.h unistd.h utime.h values.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7858: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 7864 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7868: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7874: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7882,33 +8812,83 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:7893: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -echo "$as_me:7903: checking for stdbool.h" >&5 +echo "$as_me:$LINENO: checking for stdbool.h" >&5 echo $ECHO_N "checking for stdbool.h... $ECHO_C" >&6 if test "${gt_cv_header_stdbool_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7910 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #if false int A[-1]; @@ -7929,46 +8909,51 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7932: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7935: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7938: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7941: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_header_stdbool_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_header_stdbool_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7952: result: $gt_cv_header_stdbool_h" >&5 +echo "$as_me:$LINENO: result: $gt_cv_header_stdbool_h" >&5 echo "${ECHO_T}$gt_cv_header_stdbool_h" >&6 if test $gt_cv_header_stdbool_h = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_STDBOOL_H 1 -EOF +_ACEOF STDBOOL_H='' else STDBOOL_H='stdbool.h' - echo "$as_me:7963: checking for _Bool type" >&5 + echo "$as_me:$LINENO: checking for _Bool type" >&5 echo $ECHO_N "checking for _Bool type... $ECHO_C" >&6 if test "${gt_cv_type_Bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7970 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ _Bool x = sizeof (_Bool); int main () @@ -7979,27 +8964,28 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7985: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7988: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7991: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_type_Bool=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_type_Bool=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:8002: result: $gt_cv_type_Bool" >&5 + echo "$as_me:$LINENO: result: $gt_cv_type_Bool" >&5 echo "${ECHO_T}$gt_cv_type_Bool" >&6 if test $gt_cv_type_Bool = yes; then HAVE__BOOL=1 @@ -8009,105 +8995,20 @@ echo "${ECHO_T}$gt_cv_type_Bool" >&6 fi -echo "$as_me:8012: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 8020 "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8072: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8075: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8078: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:8095: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:8098: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac -echo "$as_me:8103: checking for an ANSI C-conforming const" >&5 +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 -#line 8109 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -8164,36 +9065,37 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8167: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8170: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8173: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8176: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8186: result: $ac_cv_c_const" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define const -EOF +_ACEOF fi -echo "$as_me:8196: checking for inline" >&5 +echo "$as_me:$LINENO: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8201,159 +9103,122 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 8204 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8213: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8216: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8219: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8222: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8233: result: $ac_cv_c_inline" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; no) -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define inline -EOF +_ACEOF ;; - *) cat >>confdefs.h <>confdefs.h <<_ACEOF #define inline $ac_cv_c_inline -EOF - ;; -esac - - echo "$as_me:8248: checking for signed" >&5 -echo $ECHO_N "checking for signed... $ECHO_C" >&6 -if test "${bh_cv_c_signed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8254 "configure" -#include "confdefs.h" - -int -main () -{ -signed char x; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8269: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8272: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8275: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - bh_cv_c_signed=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -bh_cv_c_signed=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8285: result: $bh_cv_c_signed" >&5 -echo "${ECHO_T}$bh_cv_c_signed" >&6 - if test $bh_cv_c_signed = no; then - -cat >>confdefs.h <<\EOF -#define signed -EOF +_ACEOF + ;; +esac - fi - echo "$as_me:8295: checking whether backslash-a works in strings" >&5 -echo $ECHO_N "checking whether backslash-a works in strings... $ECHO_C" >&6 -if test "${ac_cv_c_backslash_a+set}" = set; then + echo "$as_me:$LINENO: checking for signed" >&5 +echo $ECHO_N "checking for signed... $ECHO_C" >&6 +if test "${bh_cv_c_signed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8301 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () { - -#if '\a' == 'a' - syntax error; -#endif - char buf['\a' == 'a' ? -1 : 1]; - buf[0] = '\a'; - return buf[0] != "\a"[0]; - +signed char x; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8320: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8323: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8326: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8329: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_backslash_a=yes + bh_cv_c_signed=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_backslash_a=no +sed 's/^/| /' conftest.$ac_ext >&5 + +bh_cv_c_signed=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8339: result: $ac_cv_c_backslash_a" >&5 -echo "${ECHO_T}$ac_cv_c_backslash_a" >&6 - if test $ac_cv_c_backslash_a = yes; then +echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5 +echo "${ECHO_T}$bh_cv_c_signed" >&6 + if test $bh_cv_c_signed = no; then -cat >>confdefs.h <<\EOF -#define HAVE_C_BACKSLASH_A 1 -EOF +cat >>confdefs.h <<\_ACEOF +#define signed +_ACEOF fi - echo "$as_me:8349: checking for unsigned long long" >&5 + + echo "$as_me:$LINENO: checking for unsigned long long" >&5 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 if test "${ac_cv_type_unsigned_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8355 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ unsigned long long ull = 1; int i = 63; int main () @@ -8365,90 +9230,48 @@ unsigned long long ullmax = (unsigned long long) -1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8368: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8371: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8374: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8377: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_unsigned_long_long=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_unsigned_long_long=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8387: result: $ac_cv_type_unsigned_long_long" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 if test $ac_cv_type_unsigned_long_long = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UNSIGNED_LONG_LONG 1 -EOF - - fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8403: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8409 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8415: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8418: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8421: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8424: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8434: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "$as_me:$LINENO: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8450 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -8462,45 +9285,50 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8468: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8471: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8474: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8484: result: $ac_cv_type_off_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define off_t long -EOF +_ACEOF fi -echo "$as_me:8496: checking for size_t" >&5 +echo "$as_me:$LINENO: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8502 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -8514,45 +9342,50 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8517: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8520: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8523: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8526: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8536: result: $ac_cv_type_size_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define size_t unsigned -EOF +_ACEOF fi -echo "$as_me:8548: checking for ptrdiff_t" >&5 +echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 if test "${ac_cv_type_ptrdiff_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8554 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -8566,43 +9399,50 @@ if (sizeof (ptrdiff_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8572: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8575: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8578: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ptrdiff_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_ptrdiff_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8588: result: $ac_cv_type_ptrdiff_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 if test $ac_cv_type_ptrdiff_t = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 -EOF +_ACEOF + fi - echo "$as_me:8598: checking for inttypes.h" >&5 + + echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8604 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -8614,43 +9454,49 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8620: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8623: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8626: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8636: result: $jm_ac_cv_header_inttypes_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 if test $jm_ac_cv_header_inttypes_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INTTYPES_H_WITH_UINTMAX 1 -EOF +_ACEOF fi - echo "$as_me:8646: checking for stdint.h" >&5 + + echo "$as_me:$LINENO: checking for stdint.h" >&5 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_stdint_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8652 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -8662,55 +9508,64 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8665: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8668: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8671: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8674: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_stdint_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8684: result: $jm_ac_cv_header_stdint_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 if test $jm_ac_cv_header_stdint_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_STDINT_H_WITH_UINTMAX 1 -EOF +_ACEOF fi + + + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then test $ac_cv_type_unsigned_long_long = yes \ && ac_type='unsigned long long' \ || ac_type='unsigned long' -cat >>confdefs.h <>confdefs.h <<_ACEOF #define uintmax_t $ac_type -EOF +_ACEOF fi - echo "$as_me:8706: checking for ssize_t" >&5 + + echo "$as_me:$LINENO: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${gt_cv_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8712 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #if HAVE_UNISTD_H @@ -8725,43 +9580,48 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8731: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8734: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8737: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_ssize_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_ssize_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8747: result: $gt_cv_ssize_t" >&5 +echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5 echo "${ECHO_T}$gt_cv_ssize_t" >&6 if test $gt_cv_ssize_t = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define ssize_t int -EOF +_ACEOF fi -echo "$as_me:8757: checking for pid_t" >&5 +echo "$as_me:$LINENO: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8763 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -8775,47 +9635,53 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8778: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8781: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8784: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8787: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8797: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define pid_t int -EOF +_ACEOF fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:8811: checking for working alloca.h" >&5 +echo "$as_me:$LINENO: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8817 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -8826,43 +9692,48 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8832: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8835: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8838: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8848: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA_H 1 -EOF +_ACEOF fi -echo "$as_me:8858: checking for alloca" >&5 +echo "$as_me:$LINENO: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8864 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -8893,33 +9764,34 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8896: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8899: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8902: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8905: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8915: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA 1 -EOF +_ACEOF else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -8929,18 +9801,23 @@ else ALLOCA=alloca.$ac_objext -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 -EOF +_ACEOF + -echo "$as_me:8936: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8942 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if defined(CRAY) && ! defined(CRAY2) webecray #else @@ -8949,7 +9826,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -8957,74 +9834,88 @@ fi rm -f conftest* fi -echo "$as_me:8960: result: $ac_cv_os_cray" >&5 +echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8965: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8971 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9002: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9005: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9008: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9011: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9021: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF break fi @@ -9032,7 +9923,7 @@ fi done fi -echo "$as_me:9035: checking stack direction for C alloca" >&5 +echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9041,8 +9932,12 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 9044 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int find_stack_direction () { @@ -9064,370 +9959,466 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9067: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9070: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9072: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9075: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:9087: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi + for ac_func in vprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9099: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9105 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9139: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9142: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9145: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9155: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF -echo "$as_me:9162: checking for _doprnt" >&5 +echo "$as_me:$LINENO: checking for _doprnt" >&5 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 if test "${ac_cv_func__doprnt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9168 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char _doprnt (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub__doprnt) || defined (__stub____doprnt) choke me #else -f = _doprnt; +char (*f) () = _doprnt; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != _doprnt; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9199: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9202: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9205: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9208: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func__doprnt=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func__doprnt=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9218: result: $ac_cv_func__doprnt" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 echo "${ECHO_T}$ac_cv_func__doprnt" >&6 if test $ac_cv_func__doprnt = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_DOPRNT 1 -EOF +_ACEOF fi fi done + + + + + + + + + + + + + for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \ strerror strtoul uname utime utimes do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9235: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9241 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9272: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9275: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9278: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9281: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9291: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + + + + + + for ac_func in memset stpcpy strcspn \ strcasecmp strncasecmp strpbrk strstr vasprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9305: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9311 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9345: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9351: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9361: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done + am_getline_needs_run_time_check=no - echo "$as_me:9374: checking for getline" >&5 + echo "$as_me:$LINENO: checking for getline" >&5 echo $ECHO_N "checking for getline... $ECHO_C" >&6 if test "${ac_cv_func_getline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9380 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getline (); below. */ -#include + which can conflict with char getline (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getline (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_getline) || defined (__stub___getline) choke me #else -f = getline; +char (*f) () = getline; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != getline; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9411: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9414: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9417: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9420: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getline=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_getline=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9430: result: $ac_cv_func_getline" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_getline" >&5 echo "${ECHO_T}$ac_cv_func_getline" >&6 if test $ac_cv_func_getline = yes; then am_getline_needs_run_time_check=yes @@ -9436,7 +10427,7 @@ else fi if test $am_getline_needs_run_time_check = yes; then - echo "$as_me:9439: checking for working getline function" >&5 + echo "$as_me:$LINENO: checking for working getline function" >&5 echo $ECHO_N "checking for working getline function... $ECHO_C" >&6 if test "${am_cv_func_working_getline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9446,8 +10437,12 @@ else am_cv_func_working_getline=no else cat >conftest.$ac_ext <<_ACEOF -#line 9449 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ # include # include @@ -9466,38 +10461,39 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9472: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9474: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9477: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_func_working_getline=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) am_cv_func_working_getline=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:9489: result: $am_cv_func_working_getline" >&5 +echo "$as_me:$LINENO: result: $am_cv_func_working_getline" >&5 echo "${ECHO_T}$am_cv_func_working_getline" >&6 fi if test $am_cv_func_working_getline = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define getline gnu_getline -EOF - - LIBOBJS="$LIBOBJS getline.${ac_objext}" +_ACEOF + LIBOBJS="$LIBOBJS getline.$ac_objext" fi if test $am_cv_func_working_getline != yes; then @@ -9505,75 +10501,89 @@ if test $am_cv_func_working_getline != yes; then for ac_func in getdelim do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9508: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9514 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9548: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9551: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9554: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9564: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done fi - echo "$as_me:9576: checking for working fnmatch function" >&5 + echo "$as_me:$LINENO: checking for working fnmatch function" >&5 echo $ECHO_N "checking for working fnmatch function... $ECHO_C" >&6 if test "${gt_cv_func_fnmatch_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9583,8 +10593,12 @@ else gt_cv_func_fnmatch_works=no else cat >conftest.$ac_ext <<_ACEOF -#line 9586 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ # include # include @@ -9596,34 +10610,36 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9599: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9602: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9604: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9607: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_fnmatch_works=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) gt_cv_func_fnmatch_works=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:9620: result: $gt_cv_func_fnmatch_works" >&5 +echo "$as_me:$LINENO: result: $gt_cv_func_fnmatch_works" >&5 echo "${ECHO_T}$gt_cv_func_fnmatch_works" >&6 if test $gt_cv_func_fnmatch_works = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_FNMATCH 1 -EOF +_ACEOF fi @@ -9633,34 +10649,87 @@ EOF test -d lib || mkdir lib echo '#include "pfnmatch.h"' > lib/fnmatch.h -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define fnmatch posix_fnmatch -EOF - - LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}" +_ACEOF + LIBOBJS="$LIBOBJS pfnmatch.$ac_objext" fi + + + + + + + for ac_header in limits.h stdlib.h string.h wchar.h wctype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9647: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9653 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9657: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:9663: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9671,101 +10740,171 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:9682: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + for ac_func in isascii iswcntrl iswprint mbsinit wcwidth do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9695: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9701 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9735: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9738: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9741: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9751: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done - echo "$as_me:9761: checking whether mbrtowc and mbstate_t are properly declared" >&5 + + echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6 if test "${jm_cv_func_mbrtowc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9767 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -9776,43 +10915,49 @@ mbstate_t state; return ! (sizeof state && mbrtowc); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9785: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9788: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_cv_func_mbrtowc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_cv_func_mbrtowc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9798: result: $jm_cv_func_mbrtowc" >&5 +echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5 echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6 if test $jm_cv_func_mbrtowc = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_MBRTOWC 1 -EOF +_ACEOF fi - echo "$as_me:9808: checking whether wcwidth is declared" >&5 + + echo "$as_me:$LINENO: checking whether wcwidth is declared" >&5 echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_wcwidth+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9814 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* AIX 3.2.5 declares wcwidth in . */ #if HAVE_STRING_H @@ -9835,26 +10980,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9838: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9841: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9844: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9847: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_decl_wcwidth=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_have_decl_wcwidth=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9857: result: $ac_cv_have_decl_wcwidth" >&5 +echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcwidth" >&5 echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6 if test $ac_cv_have_decl_wcwidth = yes; then ac_val=1 @@ -9862,30 +11008,80 @@ echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6 ac_val=0 fi -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_DECL_WCWIDTH $ac_val -EOF +_ACEOF + + + for ac_header in stdlib.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9872: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9878 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9882: \"$ac_cpp conftest.$ac_ext\"") >&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:9888: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9896,32 +11092,83 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:9907: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done - echo "$as_me:9917: checking for mbstate_t" >&5 + + echo "$as_me:$LINENO: checking for mbstate_t" >&5 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6 if test "${ac_cv_type_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9923 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if HAVE_STDLIB_H # include @@ -9936,46 +11183,56 @@ mbstate_t x; return sizeof x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9942: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9945: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9948: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mbstate_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_mbstate_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9958: result: $ac_cv_type_mbstate_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 if test $ac_cv_type_mbstate_t = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define mbstate_t int -EOF +_ACEOF fi + + + + + ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:9971: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9977 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include <$ac_hdr> @@ -9989,31 +11246,32 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9992: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9995: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9998: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10001: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10011: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -EOF +_ACEOF ac_header_dirent=$ac_hdr; break fi @@ -10021,16 +11279,20 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:10024: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line 10032 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10048,43 +11310,96 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10051: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10054: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10057: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10060: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes + ac_cv_search_opendir="none required" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done fi -echo "$as_me:10071: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + fi else - echo "$as_me:10078: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line 10086 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -10102,35 +11417,86 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10105: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10108: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10111: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10114: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes + ac_cv_search_opendir="none required" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done fi -echo "$as_me:10125: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + fi fi - echo "$as_me:10133: checking whether closedir returns void" >&5 + + + echo "$as_me:$LINENO: checking whether closedir returns void" >&5 echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 if test "${ac_cv_func_closedir_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10139,8 +11505,12 @@ else ac_cv_func_closedir_void=yes else cat >conftest.$ac_ext <<_ACEOF -#line 10142 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header_dirent> #ifndef __cplusplus @@ -10156,56 +11526,107 @@ exit (closedir (opendir (".")) != 0); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10159: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10162: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10164: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10167: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_closedir_void=no else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_closedir_void=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:10179: result: $ac_cv_func_closedir_void" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 if test $ac_cv_func_closedir_void = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define CLOSEDIR_VOID 1 -EOF +_ACEOF fi + + for ac_header in limits.h string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10192: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10198 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10202: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10208: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10216,25 +11637,71 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:10227: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done - echo "$as_me:10237: checking for long file names" >&5 + echo "$as_me:$LINENO: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10273,105 +11740,170 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do rm -rf $ac_xdir 2>/dev/null done fi -echo "$as_me:10276: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test $ac_cv_sys_long_file_names = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LONG_FILE_NAMES 1 -EOF +_ACEOF fi + for ac_func in pathconf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10289: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10295 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10326: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10329: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10332: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10335: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10345: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + for ac_header in limits.h string.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10358: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10364 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10368: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10374: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10382,44 +11914,140 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:10393: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10406: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 10412 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10416: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10422: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10430,96 +12058,157 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:10441: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + for ac_func in fork vfork do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10454: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10460 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10494: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10497: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10500: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10510: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done -ac_cv_func_fork_works=$ac_cv_func_fork if test "x$ac_cv_func_fork" = xyes; then - echo "$as_me:10522: checking for working fork" >&5 + echo "$as_me:$LINENO: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10528,7 +12217,7 @@ else ac_cv_func_fork_works=cross else cat >conftest.$ac_ext <<_ACEOF -/* By Rüdiger Kuhlmann. */ +/* By Ruediger Kuhlmann. */ #include #if HAVE_UNISTD_H # include @@ -10542,29 +12231,33 @@ else } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10548: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10550: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10553: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fork_works=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_fork_works=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:10565: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 +else + ac_cv_func_fork_works=$ac_cv_func_fork fi if test "x$ac_cv_func_fork_works" = xcross; then case $host in @@ -10576,12 +12269,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:10579: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 -echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:10584: checking for working vfork" >&5 + echo "$as_me:$LINENO: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10590,12 +12283,18 @@ else ac_cv_func_vfork_works=cross else cat >conftest.$ac_ext <<_ACEOF -#line 10593 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ #include +#include #include #include +#include #if HAVE_UNISTD_H # include #endif @@ -10608,7 +12307,7 @@ else (e.g. gcc -O) don't grok . Test for this by using a static variable whose address is put into a register that is clobbered by the vfork. */ -static +static void #ifdef __cplusplus sparc_address_test (int arg) # else @@ -10636,7 +12335,7 @@ main () pid_t parent = getpid (); pid_t child; - sparc_address_test (); + sparc_address_test (0); child = vfork (); @@ -10687,134 +12386,156 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10690: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10693: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10695: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10698: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_vfork_works=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_vfork_works=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:10710: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:10716: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 -echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_WORKING_VFORK 1 -EOF +_ACEOF else -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define vfork fork -EOF +_ACEOF fi if test "x$ac_cv_func_fork_works" = xyes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_WORKING_FORK 1 -EOF +_ACEOF fi + + for ac_func in waitpid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10744: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10750 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10781: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10784: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10787: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10790: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10800: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done -echo "$as_me:10810: checking for union wait" >&5 +echo "$as_me:$LINENO: checking for union wait" >&5 echo $ECHO_N "checking for union wait... $ECHO_C" >&6 if test "${gt_cv_union_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10816 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -10841,21 +12562,22 @@ pid = waitpid (-1, &status, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10847: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10850: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10853: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_union_wait=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_union_wait=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -10863,22 +12585,27 @@ fi if test "$gt_cv_union_wait" = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UNION_WAIT 1 -EOF +_ACEOF fi -echo "$as_me:10871: result: $gt_cv_union_wait" >&5 +echo "$as_me:$LINENO: result: $gt_cv_union_wait" >&5 echo "${ECHO_T}$gt_cv_union_wait" >&6 - echo "$as_me:10874: checking whether stat file-mode macros are broken" >&5 + + echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10880 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -10908,7 +12635,7 @@ You lose. _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "You lose" >/dev/null 2>&1; then + $EGREP "You lose" >/dev/null 2>&1; then ac_cv_header_stat_broken=yes else ac_cv_header_stat_broken=no @@ -10916,164 +12643,201 @@ fi rm -f conftest* fi -echo "$as_me:10919: result: $ac_cv_header_stat_broken" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 if test $ac_cv_header_stat_broken = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STAT_MACROS_BROKEN 1 -EOF +_ACEOF fi + for ac_func in __secure_getenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:10932: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10938 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10969: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10972: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10975: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10978: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10988: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + for ac_func in mkdtemp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11001: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11007 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11038: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11041: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11044: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11047: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11057: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done - echo "$as_me:11069: checking whether stat file-mode macros are broken" >&5 + + echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11075 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -11103,7 +12867,7 @@ You lose. _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "You lose" >/dev/null 2>&1; then + $EGREP "You lose" >/dev/null 2>&1; then ac_cv_header_stat_broken=yes else ac_cv_header_stat_broken=no @@ -11111,24 +12875,29 @@ fi rm -f conftest* fi -echo "$as_me:11114: result: $ac_cv_header_stat_broken" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 if test $ac_cv_header_stat_broken = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STAT_MACROS_BROKEN 1 -EOF +_ACEOF fi - echo "$as_me:11124: checking for inttypes.h" >&5 + + echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11130 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -11140,43 +12909,49 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11146: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11149: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11152: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11162: result: $jm_ac_cv_header_inttypes_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 if test $jm_ac_cv_header_inttypes_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INTTYPES_H_WITH_UINTMAX 1 -EOF +_ACEOF fi - echo "$as_me:11172: checking for stdint.h" >&5 + + echo "$as_me:$LINENO: checking for stdint.h" >&5 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_stdint_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11178 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -11188,55 +12963,107 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11191: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11194: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11197: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11200: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_stdint_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11210: result: $jm_ac_cv_header_stdint_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 if test $jm_ac_cv_header_stdint_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_STDINT_H_WITH_UINTMAX 1 -EOF +_ACEOF fi + + + + for ac_header in fcntl.h sys/time.h time.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11223: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11229 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11233: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11239: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11247,102 +13074,169 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:11258: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + for ac_func in gettimeofday do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11271: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11277 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11308: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11311: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11314: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11317: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11327: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + signals_not_posix= cat >conftest.$ac_ext <<_ACEOF -#line 11339 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "sigset_t" >/dev/null 2>&1; then + $EGREP "sigset_t" >/dev/null 2>&1; then : else signals_not_posix=1 @@ -11350,82 +13244,101 @@ fi rm -f conftest* if test -z "$signals_not_posix"; then - echo "$as_me:11353: checking for sigprocmask" >&5 + echo "$as_me:$LINENO: checking for sigprocmask" >&5 echo $ECHO_N "checking for sigprocmask... $ECHO_C" >&6 if test "${ac_cv_func_sigprocmask+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11359 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sigprocmask (); below. */ -#include + which can conflict with char sigprocmask (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sigprocmask (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_sigprocmask) || defined (__stub___sigprocmask) choke me #else -f = sigprocmask; +char (*f) () = sigprocmask; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != sigprocmask; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11390: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11393: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11396: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11399: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_sigprocmask=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_sigprocmask=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11409: result: $ac_cv_func_sigprocmask" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_sigprocmask" >&5 echo "${ECHO_T}$ac_cv_func_sigprocmask" >&6 if test $ac_cv_func_sigprocmask = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_POSIX_SIGNALBLOCKING 1 -EOF +_ACEOF fi fi - echo "$as_me:11421: checking for signal handlers with siginfo_t" >&5 + + echo "$as_me:$LINENO: checking for signal handlers with siginfo_t" >&5 echo $ECHO_N "checking for signal handlers with siginfo_t... $ECHO_C" >&6 if test "${gt_cv_siginfo_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11427 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int @@ -11442,126 +13355,196 @@ action.sa_sigaction = (void *) 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11445: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11448: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11451: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11454: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_siginfo_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_siginfo_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11464: result: $gt_cv_siginfo_t" >&5 +echo "$as_me:$LINENO: result: $gt_cv_siginfo_t" >&5 echo "${ECHO_T}$gt_cv_siginfo_t" >&6 if test $gt_cv_siginfo_t = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SIGINFO 1 -EOF +_ACEOF fi + + + for ac_func in setenv unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11477: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11483 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11514: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11517: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11520: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11523: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11533: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS $ac_func.$ac_objext" fi done + + + + + for ac_header in search.h stdlib.h string.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11548: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11554 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11558: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11564: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11572,102 +13555,169 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:11583: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + for ac_func in tsearch do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11596: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11602 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11633: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11636: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11639: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11642: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11652: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done - echo "$as_me:11662: checking if errno is properly declared" >&5 + + + echo "$as_me:$LINENO: checking if errno is properly declared" >&5 echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6 if test "${gt_cv_var_errno_declaration+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11669 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include extern struct { int foo; } errno; int @@ -11679,45 +13729,52 @@ errno.foo = 1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11682: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11685: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11688: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11691: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_var_errno_declaration=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_var_errno_declaration=yes fi rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:11702: result: $gt_cv_var_errno_declaration" >&5 + echo "$as_me:$LINENO: result: $gt_cv_var_errno_declaration" >&5 echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6 if test $gt_cv_var_errno_declaration = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ERRNO_DECL 1 -EOF +_ACEOF fi - echo "$as_me:11712: checking if environ is properly declared" >&5 + + + echo "$as_me:$LINENO: checking if environ is properly declared" >&5 echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6 if test "${gt_cv_var_environ_declaration+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11719 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include extern struct { int foo; } environ; int @@ -11729,44 +13786,51 @@ environ.foo = 1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11732: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11735: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11738: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11741: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_var_environ_declaration=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_var_environ_declaration=yes fi rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:11752: result: $gt_cv_var_environ_declaration" >&5 + echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5 echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6 if test $gt_cv_var_environ_declaration = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ENVIRON_DECL 1 -EOF +_ACEOF fi - echo "$as_me:11762: checking for error_at_line" >&5 + + + echo "$as_me:$LINENO: checking for error_at_line" >&5 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6 if test "${am_cv_lib_error_at_line+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11768 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -11777,55 +13841,105 @@ error_at_line(0, 0, "", 0, ""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11780: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11783: \$? = $ac_status" >&5 + 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_error_at_line=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +am_cv_lib_error_at_line=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $am_cv_lib_error_at_line" >&5 +echo "${ECHO_T}$am_cv_lib_error_at_line" >&6 + if test $am_cv_lib_error_at_line = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ERROR_AT_LINE 1 +_ACEOF + + fi + + + +for ac_header in locale.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11786: \"$ac_try\"") >&5 + { 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:11789: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_lib_error_at_line=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -am_cv_lib_error_at_line=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:11799: result: $am_cv_lib_error_at_line" >&5 -echo "${ECHO_T}$am_cv_lib_error_at_line" >&6 - if test $am_cv_lib_error_at_line = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_ERROR_AT_LINE 1 -EOF +sed 's/^/| /' conftest.$ac_ext >&5 - fi +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 -for ac_header in locale.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11812: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11818 "configure" -#include "confdefs.h" +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11822: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11836,33 +13950,83 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:11847: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -echo "$as_me:11857: checking for setlocale declaration" >&5 +echo "$as_me:$LINENO: checking for setlocale declaration" >&5 echo $ECHO_N "checking for setlocale declaration... $ECHO_C" >&6 if test "${gt_cv_proto_setlocale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11864 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -11885,21 +14049,22 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11888: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11891: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11894: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11897: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_proto_setlocale_arg1="" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_proto_setlocale_arg1="const" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -11907,35 +14072,86 @@ gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setloc fi gt_cv_proto_setlocale=`echo "$gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'` -echo "$as_me:11910: result: ${ac_t:- +echo "$as_me:$LINENO: result: ${ac_t:- }$gt_cv_proto_setlocale" >&5 echo "${ECHO_T}${ac_t:- }$gt_cv_proto_setlocale" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define SETLOCALE_CONST $gt_cv_proto_setlocale_arg1 -EOF +_ACEOF + + + + for ac_header in arpa/inet.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11922: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 11928 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11932: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11938: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11946,102 +14162,170 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:11957: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + for ac_func in gethostname gethostbyname inet_ntop do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:11970: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11976 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12007: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12010: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12013: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12016: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12026: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done - echo "$as_me:12036: checking for IPv6 sockets" >&5 + + echo "$as_me:$LINENO: checking for IPv6 sockets" >&5 echo $ECHO_N "checking for IPv6 sockets... $ECHO_C" >&6 if test "${gt_cv_socket_ipv6+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12043 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -12055,37 +14339,40 @@ int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12058: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12061: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12064: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12067: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_socket_ipv6=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_socket_ipv6=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:12079: result: $gt_cv_socket_ipv6" >&5 + echo "$as_me:$LINENO: result: $gt_cv_socket_ipv6" >&5 echo "${ECHO_T}$gt_cv_socket_ipv6" >&6 if test $gt_cv_socket_ipv6 = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_IPV6 1 -EOF +_ACEOF fi + + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" @@ -12094,46 +14381,82 @@ EOF MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi - # Extract the first word of "msgfmt", so it can be a program name with args. + + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:12099: checking for $ac_word" >&5 +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_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + 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" - break - fi - fi - done - IFS="$ac_save_ifs" + 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:12127: result: $MSGFMT" >&5 + echo "$as_me:$LINENO: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:12130: result: no" >&5 + 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:12136: checking for $ac_word" >&5 +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 @@ -12143,16 +14466,18 @@ else ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:12153: found $ac_dir/$ac_word" >&5 - break -fi + 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" @@ -12162,95 +14487,161 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:12165: result: $GMSGFMT" >&5 + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:12168: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # Extract the first word of "xgettext", so it can be a program name with args. + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:12174: checking for $ac_word" >&5 +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_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && + 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= /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + 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:12202: result: $XGETTEXT" >&5 + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:12205: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f messages.po - # Extract the first word of "msgmerge", so it can be a program name with args. + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -echo "$as_me:12213: checking for $ac_word" >&5 +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_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + 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:12240: result: $MSGMERGE" >&5 + echo "$as_me:$LINENO: result: $MSGMERGE" >&5 echo "${ECHO_T}$MSGMERGE" >&6 else - echo "$as_me:12243: result: no" >&5 + 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:12253: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 + 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 @@ -12261,19 +14652,20 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else - echo "$as_me:12264: result: found xgettext program is not GNU xgettext; ignore it" >&5 + 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-2" + ac_config_commands="$ac_config_commands default-1" + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:12276: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12281,25 +14673,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:12291: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:12299: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:12302: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -12308,7 +14703,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:12311: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12316,15 +14711,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:12326: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -12332,38 +14730,87 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:12335: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:12338: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + + + +for ac_header in stdlib.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" +ac_header_compiler=no fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12350: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12356 "configure" -#include "confdefs.h" +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12360: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12366: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12374,94 +14821,155 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:12385: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12398: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12404 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12435: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12438: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12441: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12444: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12454: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done -echo "$as_me:12464: checking for working mmap" >&5 +echo "$as_me:$LINENO: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12470,9 +14978,16 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 12473 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc + /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: mmap private not fixed @@ -12488,7 +15003,7 @@ $ac_includes_default VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get - propogated back to all the places they're supposed to be. + propagated back to all the places they're supposed to be. Grep wants private fixed already mapped. The main things grep needs to know about mmap are: @@ -12597,45 +15112,52 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12600: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12603: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12605: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12608: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:12620: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_MMAP 1 -EOF +_ACEOF fi rm -f conftest.mmap - echo "$as_me:12631: checking whether we are using the GNU C Library 2.1 or newer" >&5 + + echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12637 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef __GNU_LIBRARY__ @@ -12646,20 +15168,25 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "Lucky GNU user" >/dev/null 2>&1; then + $EGREP "Lucky GNU user" >/dev/null 2>&1; then ac_cv_gnu_library_2_1=yes else ac_cv_gnu_library_2_1=no fi rm -f conftest* + + fi -echo "$as_me:12657: result: $ac_cv_gnu_library_2_1" >&5 +echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 GLIBC21="$ac_cv_gnu_library_2_1" - echo "$as_me:12662: checking whether integer division by zero raises SIGFPE" >&5 + + + + echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5 echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6 if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12677,8 +15204,12 @@ else else cat >conftest.$ac_ext <<_ACEOF -#line 12680 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -12718,47 +15249,55 @@ int main () _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12721: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12724: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12726: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12729: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_int_divbyzero_sigfpe=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) gt_cv_int_divbyzero_sigfpe=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:12742: result: $gt_cv_int_divbyzero_sigfpe" >&5 +echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5 echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6 case "$gt_cv_int_divbyzero_sigfpe" in *yes) value=1;; *) value=0;; esac -cat >>confdefs.h <>confdefs.h <<_ACEOF #define INTDIV0_RAISES_SIGFPE $value -EOF +_ACEOF + + - echo "$as_me:12753: checking for inttypes.h" >&5 + echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 if test "${gt_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12760 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -12770,46 +15309,53 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12773: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12776: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12779: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12793: result: $gt_cv_header_inttypes_h" >&5 +echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5 echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6 if test $gt_cv_header_inttypes_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INTTYPES_H 1 -EOF +_ACEOF fi + + if test $gt_cv_header_inttypes_h = yes; then - echo "$as_me:12804: checking whether the inttypes.h PRIxNN macros are broken" >&5 + echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6 if test "${gt_cv_inttypes_pri_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12811 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef PRId32 char *p = PRId32; @@ -12824,37 +15370,39 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12827: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12830: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12833: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12836: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_inttypes_pri_broken=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_inttypes_pri_broken=yes fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12847: result: $gt_cv_inttypes_pri_broken" >&5 +echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6 fi if test "$gt_cv_inttypes_pri_broken" = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PRI_MACROS_BROKEN 1 -EOF +_ACEOF fi + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -12870,6 +15418,7 @@ EOF eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -12877,10 +15426,23 @@ if test "${with_gnu_ld+set}" = set; then 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:12883: checking for ld used by GCC" >&5 + 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*) @@ -12910,10 +15472,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:12913: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:12916: checking for non-GNU ld" >&5 + 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 @@ -12943,16 +15505,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:12946: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:12949: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:12952: error: no acceptable ld found in \$PATH" >&5 +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:12955: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -12964,11 +15526,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:12967: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:12971: checking for shared library run path origin" >&5 + + + 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 @@ -12981,7 +15545,7 @@ else acl_cv_rpath=done fi -echo "$as_me:12984: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -13000,6 +15564,12 @@ else enable_rpath=yes fi; + + + + + + use_additional=yes acl_save_prefix="$prefix" @@ -13013,6 +15583,7 @@ fi; 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" @@ -13375,27 +15946,87 @@ fi; done fi + + + + + + + + + + + + + for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13382: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13388 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13392: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13398: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13406,95 +16037,182 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:13417: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + + + + + + + + + + + + + + + + + for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13432: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13438 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13472: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13475: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13478: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13488: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + + + + am_save_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do @@ -13519,7 +16237,8 @@ done fi done - echo "$as_me:13522: checking for iconv" >&5 + + 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 @@ -13528,8 +16247,12 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF -#line 13531 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -13543,29 +16266,34 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13546: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13549: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13552: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13555: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f 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 -#line 13567 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -13579,41 +16307,42 @@ iconv_t cd = iconv_open("",""); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13585: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13588: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13591: \$? = $ac_status" >&5 + 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 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -echo "$as_me:13604: result: $am_cv_func_iconv" >&5 +echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 -EOF +_ACEOF fi if test "$am_cv_lib_iconv" = yes; then - echo "$as_me:13614: checking how to link with libiconv" >&5 + 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:13616: result: $LIBICONV" >&5 + echo "$as_me:$LINENO: result: $LIBICONV" >&5 echo "${ECHO_T}$LIBICONV" >&6 else CPPFLAGS="$am_save_CPPFLAGS" @@ -13621,16 +16350,22 @@ echo "${ECHO_T}$LIBICONV" >&6 LTLIBICONV= fi + + if test "$am_cv_func_iconv" = yes; then - echo "$as_me:13625: checking for iconv declaration" >&5 + echo "$as_me:$LINENO: checking for iconv declaration" >&5 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 if test "${am_cv_proto_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13632 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -13653,21 +16388,22 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13659: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13662: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13665: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_proto_iconv_arg1="" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + am_cv_proto_iconv_arg1="const" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -13675,25 +16411,30 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - echo "$as_me:13678: result: ${ac_t:- + echo "$as_me:$LINENO: result: ${ac_t:- }$am_cv_proto_iconv" >&5 echo "${ECHO_T}${ac_t:- }$am_cv_proto_iconv" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define ICONV_CONST $am_cv_proto_iconv_arg1 -EOF +_ACEOF fi - echo "$as_me:13689: checking for nl_langinfo and CODESET" >&5 + + echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13695 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -13704,46 +16445,51 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13707: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13710: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13713: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13716: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + am_cv_langinfo_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13727: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LANGINFO_CODESET 1 -EOF +_ACEOF fi if test $ac_cv_header_locale_h = yes; then - echo "$as_me:13739: checking for LC_MESSAGES" >&5 + echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13745 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -13754,32 +16500,33 @@ return LC_MESSAGES } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13757: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13760: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13763: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13766: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13776: result: $am_cv_val_LC_MESSAGES" >&5 +echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LC_MESSAGES 1 -EOF +_ACEOF fi @@ -13789,7 +16536,7 @@ EOF do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:13792: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13797,25 +16544,28 @@ else if test -n "$INTLBISON"; then ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:13807: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_INTLBISON="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$as_me:13815: result: $INTLBISON" >&5 + echo "$as_me:$LINENO: result: $INTLBISON" >&5 echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:13818: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13825,7 +16575,7 @@ done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo "$as_me:13828: checking version of bison" >&5 + echo "$as_me:$LINENO: checking version of bison" >&5 echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in @@ -13834,14 +16584,28 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$as_me:13837: result: $ac_prog_version" >&5 + echo "$as_me:$LINENO: result: $ac_prog_version" >&5 echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then INTLBISON=: fi - echo "$as_me:13844: checking whether NLS is requested" >&5 + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then @@ -13850,9 +16614,11 @@ if test "${enable_nls+set}" = set; then else USE_NLS=yes fi; - echo "$as_me:13853: result: $USE_NLS" >&5 + echo "$as_me:$LINENO: result: $USE_NLS" >&5 echo "${ECHO_T}$USE_NLS" >&6 + + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no @@ -13863,7 +16629,7 @@ echo "${ECHO_T}$USE_NLS" >&6 if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - echo "$as_me:13866: checking whether included gettext is requested" >&5 + echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 # Check whether --with-included-gettext or --without-included-gettext was given. @@ -13873,20 +16639,29 @@ if test "${with_included_gettext+set}" = set; then else nls_cv_force_use_gnu_gettext=no fi; - echo "$as_me:13876: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + + + + + - echo "$as_me:13882: checking for GNU gettext in libc" >&5 + 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_gnugettext2_libc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13888 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* 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; @@ -13900,30 +16675,33 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13903: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13906: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13909: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13912: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_gnugettext2_libc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext2_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13922: result: $gt_cv_func_gnugettext2_libc" >&5 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5 echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6 if test "$gt_cv_func_gnugettext2_libc" != "yes"; then + + use_additional=yes acl_save_prefix="$prefix" @@ -13937,6 +16715,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6 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" @@ -14299,7 +17078,7 @@ fi; done fi - echo "$as_me:14302: checking for GNU gettext in libintl" >&5 + 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_gnugettext2_libintl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14309,8 +17088,12 @@ else gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" cat >conftest.$ac_ext <<_ACEOF -#line 14312 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* 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 @@ -14328,29 +17111,34 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14331: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14334: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14337: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14340: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_func_gnugettext2_libintl=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext2_libintl=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF -#line 14352 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* 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 @@ -14368,16 +17156,16 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14374: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14377: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14380: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" @@ -14385,14 +17173,15 @@ if { (eval echo "$as_me:14371: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -echo "$as_me:14395: result: $gt_cv_func_gnugettext2_libintl" >&5 +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5 echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6 fi @@ -14406,6 +17195,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6 INCINTL= fi + if test "$gt_use_preinstalled_gnugettext" != "yes"; then nls_cv_use_gnu_gettext=yes fi @@ -14425,25 +17215,46 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6 CATOBJEXT=.gmo fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define ENABLE_NLS 1 -EOF +_ACEOF else USE_NLS=no fi fi + echo "$as_me:$LINENO: checking whether to use NLS" >&5 +echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + if test "$USE_NLS" = "yes"; then + echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 +echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext2_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_gnugettext2_libintl" = "yes"; then - echo "$as_me:14444: checking how to link with libintl" >&5 + 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:14446: result: $LIBINTL" >&5 + echo "$as_me:$LINENO: result: $LIBINTL" >&5 echo "${ECHO_T}$LIBINTL" >&6 for element in $INCINTL; do @@ -14470,49 +17281,81 @@ echo "${ECHO_T}$LIBINTL" >&6 fi -cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_GETTEXT 1 -EOF +_ACEOF + -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_DCGETTEXT 1 -EOF +_ACEOF fi POSUB=po fi + if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi + + + + + nls_cv_header_intl= nls_cv_header_libgt= DATADIRNAME=share + INSTOBJEXT=.mo + GENCAT=gencat + INTL_LIBTOOL_SUFFIX_PREFIX=l + + INTLLIBS="$LIBINTL" + + + + + + + + + + + case "$host_os" in linux*) -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define DYNLOAD_LIBEXPAT 1 -EOF +_ACEOF LIBEXPAT="-ldl" LTLIBEXPAT="-ldl" + ;; *) + + + + + + + use_additional=yes acl_save_prefix="$prefix" @@ -14526,6 +17369,7 @@ EOF exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-libexpat-prefix or --without-libexpat-prefix was given. if test "${with_libexpat_prefix+set}" = set; then withval="$with_libexpat_prefix" @@ -14888,6 +17732,7 @@ fi; done fi + ac_save_CPPFLAGS="$CPPFLAGS" for element in $INCEXPAT; do @@ -14912,7 +17757,8 @@ fi; fi done - echo "$as_me:14915: checking for libexpat" >&5 + + echo "$as_me:$LINENO: checking for libexpat" >&5 echo $ECHO_N "checking for libexpat... $ECHO_C" >&6 if test "${ac_cv_libexpat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14921,8 +17767,12 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS $LIBEXPAT" cat >conftest.$ac_ext <<_ACEOF -#line 14924 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -14933,39 +17783,40 @@ XML_ExpatVersion(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14936: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14939: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14942: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14945: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_libexpat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_libexpat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" fi -echo "$as_me:14957: result: $ac_cv_libexpat" >&5 +echo "$as_me:$LINENO: result: $ac_cv_libexpat" >&5 echo "${ECHO_T}$ac_cv_libexpat" >&6 if test "$ac_cv_libexpat" = yes; then HAVE_LIBEXPAT=yes -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LIBEXPAT 1 -EOF +_ACEOF - echo "$as_me:14966: checking how to link with libexpat" >&5 + echo "$as_me:$LINENO: checking how to link with libexpat" >&5 echo $ECHO_N "checking how to link with libexpat... $ECHO_C" >&6 - echo "$as_me:14968: result: $LIBEXPAT" >&5 + echo "$as_me:$LINENO: result: $LIBEXPAT" >&5 echo "${ECHO_T}$LIBEXPAT" >&6 else HAVE_LIBEXPAT=no @@ -14974,27 +17825,33 @@ echo "${ECHO_T}$LIBEXPAT" >&6 LTLIBEXPAT= fi + + + + + ;; esac + # Check whether --with-lispdir or --without-lispdir was given. if test "${with_lispdir+set}" = set; then withval="$with_lispdir" lispdir="$withval" - echo "$as_me:14984: checking where .elc files should go" >&5 + echo "$as_me:$LINENO: checking where .elc files should go" >&5 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 - echo "$as_me:14986: result: $lispdir" >&5 + echo "$as_me:$LINENO: result: $lispdir" >&5 echo "${ECHO_T}$lispdir" >&6 else - # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= - for ac_prog in emacs xemacs + # If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. + test x"$EMACS" = xt && EMACS= + for ac_prog in emacs xemacs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:14997: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_EMACS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15002,25 +17859,28 @@ else if test -n "$EMACS"; then ac_cv_prog_EMACS="$EMACS" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_EMACS="$ac_prog" -echo "$as_me:15012: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_EMACS="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi EMACS=$ac_cv_prog_EMACS if test -n "$EMACS"; then - echo "$as_me:15020: result: $EMACS" >&5 + echo "$as_me:$LINENO: result: $EMACS" >&5 echo "${ECHO_T}$EMACS" >&6 else - echo "$as_me:15023: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15028,33 +17888,51 @@ fi done test -n "$EMACS" || EMACS="no" - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - echo "$as_me:15033: checking where .elc files should go" >&5 + if test $EMACS != "no"; then + if test x${lispdir+set} != xset; then + echo "$as_me:$LINENO: checking where .elc files should go" >&5 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6 if test "${am_cv_lispdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'` - if test -z "$am_cv_lispdir"; then - am_cv_lispdir='${datadir}/emacs/site-lisp' - fi + # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly + # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, + # which is non-obvious for non-emacs users. + # Redirecting /dev/null should help a bit; pity we can't detect "broken" + # emacsen earlier and avoid running this altogether. + { (echo "$as_me:$LINENO: \$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) \"\\n\")) (setq load-path (cdr load-path)))' conftest.out") >&5 + ($EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + am_cv_lispdir=`sed -n \ + -e 's,/$,,' \ + -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \ + -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \ + conftest.out` + rm conftest.out + if test -z "$am_cv_lispdir"; then + am_cv_lispdir='${datadir}/emacs/site-lisp' + fi fi -echo "$as_me:15044: result: $am_cv_lispdir" >&5 +echo "$as_me:$LINENO: result: $am_cv_lispdir" >&5 echo "${ECHO_T}$am_cv_lispdir" >&6 - lispdir="$am_cv_lispdir" - fi - fi + lispdir="$am_cv_lispdir" + fi + fi fi; + + aclocaldir='${datadir}/aclocal' + ac_aux_dir_abs=`cd $ac_aux_dir && pwd` # Extract the first word of "dvips", so it can be a program name with args. set dummy dvips; ac_word=$2 -echo "$as_me:15057: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DVIPS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15064,16 +17942,18 @@ else ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_DVIPS="$ac_dir/$ac_word" - echo "$as_me:15074: found $ac_dir/$ac_word" >&5 - break -fi + 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_DVIPS="$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_DVIPS" && ac_cv_path_DVIPS="$ac_aux_dir_abs/missing dvips" @@ -15083,16 +17963,16 @@ fi DVIPS=$ac_cv_path_DVIPS if test -n "$DVIPS"; then - echo "$as_me:15086: result: $DVIPS" >&5 + echo "$as_me:$LINENO: result: $DVIPS" >&5 echo "${ECHO_T}$DVIPS" >&6 else - echo "$as_me:15089: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "texi2pdf", so it can be a program name with args. set dummy texi2pdf; ac_word=$2 -echo "$as_me:15095: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEXI2PDF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15102,16 +17982,18 @@ else ac_cv_path_TEXI2PDF="$TEXI2PDF" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_TEXI2PDF="$ac_dir/$ac_word" - echo "$as_me:15112: found $ac_dir/$ac_word" >&5 - break -fi + 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_TEXI2PDF="$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_TEXI2PDF" && ac_cv_path_TEXI2PDF="$ac_aux_dir_abs/missing texi2pdf" @@ -15121,16 +18003,16 @@ fi TEXI2PDF=$ac_cv_path_TEXI2PDF if test -n "$TEXI2PDF"; then - echo "$as_me:15124: result: $TEXI2PDF" >&5 + echo "$as_me:$LINENO: result: $TEXI2PDF" >&5 echo "${ECHO_T}$TEXI2PDF" >&6 else - echo "$as_me:15127: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:15133: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15140,16 +18022,18 @@ else ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PERL="$ac_dir/$ac_word" - echo "$as_me:15150: found $ac_dir/$ac_word" >&5 - break -fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="$ac_aux_dir_abs/missing perl" @@ -15159,20 +18043,22 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:15162: result: $PERL" >&5 + echo "$as_me:$LINENO: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:15165: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + CROSS_COMPILING=$cross_compiling + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:15175: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15180,25 +18066,28 @@ else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CXX="$ac_prog" -echo "$as_me:15190: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:15198: result: $CXX" >&5 + echo "$as_me:$LINENO: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:15201: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15207,7 +18096,7 @@ done test -n "$CXX" || CXX=":" if test "$CXX" != ":"; then - echo "$as_me:15210: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + echo "$as_me:$LINENO: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 echo $ECHO_N "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -15215,11 +18104,13 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + echo 'int main () { return 0; }' > conftest.$ac_ext - if { (eval echo "$as_me:15219: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15222: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then ac_cv_prog_cxx_works=yes if (./conftest; exit) 2>/dev/null; then @@ -15237,12 +18128,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:15240: result: $ac_cv_prog_cxx_works" >&5 + echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_works" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_works" >&6 if test $ac_cv_prog_cxx_works = no; then CXX=: else - echo "$as_me:15245: checking whether the C++ compiler supports namespaces" >&5 + echo "$as_me:$LINENO: checking whether the C++ compiler supports namespaces" >&5 echo $ECHO_N "checking whether the C++ compiler supports namespaces... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -15255,10 +18146,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu namespace test { using namespace std; } int main () { return 0; } EOF - if { (eval echo "$as_me:15258: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15261: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then gt_cv_prog_cxx_namespaces=yes else @@ -15271,7 +18162,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:15274: result: $gt_cv_prog_cxx_namespaces" >&5 + echo "$as_me:$LINENO: result: $gt_cv_prog_cxx_namespaces" >&5 echo "${ECHO_T}$gt_cv_prog_cxx_namespaces" >&6 if test $gt_cv_prog_cxx_namespaces = no; then CXX=: @@ -15285,6 +18176,11 @@ else SUBDIR_libasprintf= fi + + + + + test -d intl || mkdir intl echo "GNU gettext library from $PACKAGE-$VERSION" > intl/VERSION cat > intl/ChangeLog.inst < EOF -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` - LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` + + + subdirs="$subdirs libasprintf" -ac_config_files="$ac_config_files Makefile intl/Makefile intl-java/Makefile lib/Makefile lib/javacomp.sh lib/javaexec.sh libuniname/Makefile src/Makefile src/user-email po/Makefile.in doc/Makefile man/Makefile man/x-to-1 tests/Makefile m4/Makefile projects/Makefile misc/Makefile misc/gettextize misc/autopoint" -ac_config_commands="$ac_config_commands default" + + ac_config_files="$ac_config_files Makefile" + + + ac_config_files="$ac_config_files intl/Makefile" + + + ac_config_files="$ac_config_files intl-java/Makefile" + + + ac_config_files="$ac_config_files lib/Makefile" + + ac_config_files="$ac_config_files lib/javacomp.sh lib/javaexec.sh" + + + ac_config_files="$ac_config_files libuniname/Makefile" + + + ac_config_files="$ac_config_files src/Makefile" + + ac_config_files="$ac_config_files src/user-email" + + + ac_config_files="$ac_config_files po/Makefile.in" + + + ac_config_files="$ac_config_files doc/Makefile" + + + ac_config_files="$ac_config_files man/Makefile" + + ac_config_files="$ac_config_files man/x-to-1" + + + ac_config_files="$ac_config_files tests/Makefile" + + + ac_config_files="$ac_config_files m4/Makefile" + + + ac_config_files="$ac_config_files projects/Makefile" + + + ac_config_files="$ac_config_files misc/Makefile" + + ac_config_files="$ac_config_files misc/gettextize" + + ac_config_files="$ac_config_files misc/autopoint" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -15312,7 +18257,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -15347,7 +18292,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -15378,35 +18323,241 @@ fi DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:15384: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -15430,26 +18581,22 @@ elif ln conf$$.file conf$$ 2>/dev/null; then else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. @@ -15458,10 +18605,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.57. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -15481,7 +18652,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -15491,6 +18662,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -15508,12 +18680,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -15522,9 +18694,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -15534,30 +18706,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15560: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -15567,16 +18739,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:15579: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -15588,41 +18763,41 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # -AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF + + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -15646,11 +18821,10 @@ do "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;; "misc/gettextize" ) CONFIG_FILES="$CONFIG_FILES misc/gettextize" ;; "misc/autopoint" ) CONFIG_FILES="$CONFIG_FILES misc/autopoint" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:15653: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -15666,6 +18840,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -15674,23 +18851,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -15703,6 +18880,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -15718,27 +18901,20 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t @@ -15746,21 +18922,27 @@ s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@DEPDIR@,$DEPDIR,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@DEPDIR@,$DEPDIR,;t t s,@am__include@,$am__include,;t t s,@am__quote@,$am__quote,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@YACC@,$YACC,;t t s,@LEX@,$LEX,;t t s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t @@ -15769,6 +18951,7 @@ s,@GCJFLAGS@,$GCJFLAGS,;t t s,@HAVE_GCJ@,$HAVE_GCJ,;t t s,@BUILDJAVAEXE@,$BUILDJAVAEXE,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@HAVE_GCJ_IN_PATH@,$HAVE_GCJ_IN_PATH,;t t s,@HAVE_JAVAC_IN_PATH@,$HAVE_JAVAC_IN_PATH,;t t s,@HAVE_JIKES_IN_PATH@,$HAVE_JIKES_IN_PATH,;t t @@ -15802,14 +18985,6 @@ s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@HAVE__BOOL@,$HAVE__BOOL,;t t s,@STDBOOL_H@,$STDBOOL_H,;t t @@ -15853,14 +19028,14 @@ s,@SUBDIR_libasprintf@,$SUBDIR_libasprintf,;t t s,@GCC@,$GCC,;t t s,@LD@,$LD,;t t s,@with_gnu_ld@,$with_gnu_ld,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t s,@LTALLOCA@,$LTALLOCA,;t t s,@subdirs@,$subdirs,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -15899,8 +19074,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -15914,7 +19089,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -15925,60 +19101,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:15973: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -15988,7 +19188,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:15991: error: cannot find input file: $f" >&5 + 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;; @@ -16001,23 +19201,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16004: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -16028,9 +19234,46 @@ s,@INSTALL@,$ac_INSTALL,;t t rm -f $tmp/out fi + # Run the commands associated with the file. + case $ac_file in + Makefile ) + sed -e 's,^#distdir:,distdir:,' < Makefile > Makefile.tmp + mv Makefile.tmp Makefile + ;; + lib/Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < lib/Makefile > lib/Makefile.tmp + mv lib/Makefile.tmp lib/Makefile + ;; + libuniname/Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < libuniname/Makefile > libuniname/Makefile.tmp + mv libuniname/Makefile.tmp libuniname/Makefile + ;; + src/Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < src/Makefile > src/Makefile.tmp + mv src/Makefile.tmp src/Makefile + ;; + doc/Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < doc/Makefile > doc/Makefile.tmp + mv doc/Makefile.tmp doc/Makefile + + + sed -e 's,^#distdir:,distdir:,' < doc/Makefile > doc/Makefile.tmp + mv doc/Makefile.tmp doc/Makefile + + + sed -e '/@rm -f \$''@/d' < doc/Makefile > doc/Makefile.tmp + mv doc/Makefile.tmp doc/Makefile + ;; + tests/Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < tests/Makefile > tests/Makefile.tmp + mv tests/Makefile.tmp tests/Makefile + ;; + misc/gettextize ) chmod a+x misc/gettextize ;; + misc/autopoint ) chmod a+x misc/autopoint ;; + esac done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. @@ -16062,7 +19305,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:16065: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -16073,7 +19316,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:16076: error: cannot find input file: $f" >&5 + 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;; @@ -16086,7 +19329,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16089: error: cannot find input file: $f" >&5 + { { 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;; @@ -16095,7 +19338,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -EOF +_ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -16111,16 +19354,16 @@ rm -f conftest.defines conftest.undefs # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF +cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${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 : end -EOF +_ACEOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. @@ -16131,14 +19374,14 @@ rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # 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 <<\EOF +cat >>conftest.undefs <<\_ACEOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF +_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 egrep "^[ ]*#[ ]*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 @@ -16162,7 +19405,7 @@ do mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -16190,23 +19433,24 @@ do done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ + # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:16206: $ac_file is unchanged" >&5 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -16217,24 +19461,31 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + { 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; }; }; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -16242,15 +19493,22 @@ done; } cat $tmp/config.h rm -f $tmp/config.h fi - # Run the commands associated with the file. - case $ac_file in - config.h ) # update the timestamp -echo timestamp >"./stamp-h" - ;; - esac +_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -16258,16 +19516,79 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - default-1 ) -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. @@ -16292,14 +19613,49 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + 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 $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - default-2 ) + default-1 ) for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in @@ -16329,13 +19685,16 @@ done # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then + if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi case "$ac_given_srcdir" in .) srcdirpre= ;; @@ -16397,32 +19756,18 @@ done ;; esac done ;; - default ) - for m in lib/Makefile src/Makefile tests/Makefile; do - sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp - mv $m.tmp $m - done - for m in Makefile doc/Makefile; do - sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp - mv $m.tmp $m - done - for m in doc/Makefile; do - sed -e '/cd \$(srcdir) && rm -f /d' < $m > $m.tmp - mv $m.tmp $m - done - chmod a+x misc/gettextize misc/autopoint - ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -16433,8 +19778,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -16468,71 +19816,97 @@ if test "$no_recursion" != yes; then ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; esac done - for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. - test -d $srcdir/$ac_subdir || continue - - { echo "$as_me:16481: configuring in $ac_subdir" >&5 -echo "$as_me: configuring in $ac_subdir" >&6;} - case $srcdir in - .) ;; - *) { case "./$ac_subdir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="./$ac_subdir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + test -d $srcdir/$ac_dir || continue - if test -d ./$ac_subdir; then :; - else - { { echo "$as_me:16503: error: cannot create \`pwd\`/$ac_subdir" >&5 -echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;} - { (exit 1); exit 1; }; } - fi - ;; - esac + { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 +echo "$as_me: configuring in $ac_dir" >&6;} + { 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_popdir=`pwd` - cd $ac_subdir + ac_builddir=. - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` +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_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac +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 +# 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` + + + cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'" - elif test -f $ac_sub_srcdir/configure; then - ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'" - elif test -f $ac_sub_srcdir/configure.in; then + if test -f $ac_srcdir/configure.gnu; then + ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" + elif test -f $ac_srcdir/configure; then + ac_sub_configure="$SHELL '$ac_srcdir/configure'" + elif test -f $ac_srcdir/configure.in; then ac_sub_configure=$ac_configure else - { echo "$as_me:16534: WARNING: no configuration information is in $ac_subdir" >&5 -echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} ac_sub_configure= fi @@ -16542,16 +19916,16 @@ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} case $cache_file in [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. - ac_sub_cache_file=$ac_dots$cache_file ;; + ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac - { echo "$as_me:16548: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;} + { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir || - { { echo "$as_me:16553: error: $ac_sub_configure failed for $ac_subdir" >&5 -echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;} + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi diff --git a/doc/Makefile.in b/doc/Makefile.in index d22bbbf8a..fe920dc51 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -114,7 +114,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -122,7 +121,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/doc/gettext.info b/doc/gettext.info index dfac8bdb6..b4b1eed1d 100644 --- a/doc/gettext.info +++ b/doc/gettext.info @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -32,187 +47,188 @@ translation approved by the Foundation.  Indirect: -gettext.info-1: 1417 -gettext.info-2: 49129 -gettext.info-3: 93988 -gettext.info-4: 140504 -gettext.info-5: 186114 -gettext.info-6: 233989 -gettext.info-7: 281039 -gettext.info-8: 330840 -gettext.info-9: 370626 -gettext.info-10: 407816 +gettext.info-1: 2520 +gettext.info-2: 50288 +gettext.info-3: 95147 +gettext.info-4: 142113 +gettext.info-5: 187723 +gettext.info-6: 235598 +gettext.info-7: 282648 +gettext.info-8: 332565 +gettext.info-9: 372723 +gettext.info-10: 409975  Tag Table: (Indirect) -Node: Top1417 -Node: Introduction11759 -Node: Why13617 -Ref: Why-Footnote-116724 -Node: Concepts16880 -Node: Aspects20293 -Node: Files26131 -Node: Overview28032 -Node: Basics38824 -Node: Installation39654 -Node: PO Files41596 -Ref: PO Files-Footnote-149002 -Node: Main PO Commands49129 -Node: Entry Positioning54199 -Node: Normalizing59653 -Node: Sources64106 -Node: Triggering65439 -Node: Preparing Strings68469 -Node: Mark Keywords75347 -Node: Marking78902 -Node: c-format Flag86623 -Node: Special cases90534 -Node: Template93267 -Node: xgettext Invocation93988 -Node: Creating100580 -Node: msginit Invocation101471 -Node: Header Entry103337 -Node: Updating109743 -Node: msgmerge Invocation110498 -Node: Translated Entries114596 -Node: Fuzzy Entries115950 -Node: Untranslated Entries119119 -Node: Obsolete Entries121039 -Node: Modifying Translations124252 -Node: Modifying Comments132209 -Node: Subedit136622 -Node: C Sources Context140504 -Node: Auxiliary145614 -Node: Compendium148839 -Node: Creating Compendia149449 -Node: Using Compendia151888 -Node: Manipulating152776 -Node: msgcat Invocation156256 -Node: msgconv Invocation159731 -Node: msggrep Invocation162137 -Node: msgfilter Invocation166064 -Node: msguniq Invocation170158 -Node: msgcomm Invocation173274 -Node: msgcmp Invocation176544 -Node: msgattrib Invocation177774 -Node: msgen Invocation181135 -Node: msgexec Invocation183731 -Node: Binaries185782 -Node: msgfmt Invocation186114 -Node: msgunfmt Invocation191846 -Node: MO Files194773 -Node: Users202864 -Node: Matrix204347 -Node: Installers205551 -Node: End Users206721 -Node: Programmers207370 -Node: catgets208543 -Node: Interface to catgets209946 -Node: Problems with catgets211950 -Node: gettext212851 -Node: Interface to gettext214309 -Node: Ambiguities216648 -Node: Locating Catalogs219341 -Ref: Locating Catalogs-Footnote-1220488 -Ref: Locating Catalogs-Footnote-2220713 -Node: Charset conversion220862 -Node: Plural forms223304 -Ref: Plural forms-Footnote-1233897 -Node: GUI program problems233989 -Node: Optimized gettext239093 -Node: Comparison240426 -Node: Using libintl.a244696 -Node: gettext grok245129 -Node: Temp Programmers247678 -Node: Temp Implementations248118 -Node: Temp catgets249484 -Node: Temp WSI251171 -Node: Temp Notes253159 -Node: Translators253648 -Node: Trans Intro 0254027 -Node: Trans Intro 1256676 -Node: Discussions258540 -Node: Organization262039 -Node: Central Coordination264020 -Node: National Teams265148 -Node: Sub-Cultures267660 -Node: Organizational Ideas268579 -Node: Mailing Lists269582 -Node: Information Flow271385 -Node: Maintainers273518 -Node: Flat and Non-Flat275415 -Node: Prerequisites276898 -Node: gettextize Invocation281039 -Node: Adjusting Files287742 -Node: po/POTFILES.in289466 -Node: po/LINGUAS290711 -Node: po/Makevars291493 -Node: configure.in293079 -Node: config.guess295169 -Node: mkinstalldirs296285 -Node: aclocal297046 -Node: acconfig298667 -Node: config.h.in299153 -Node: Makefile300310 -Node: src/Makefile302891 -Node: lib/gettext.h305906 -Node: autoconf macros308131 -Node: AM_GNU_GETTEXT308701 -Node: AM_GNU_GETTEXT_VERSION312430 -Node: AM_ICONV312860 -Node: CVS Issues315054 -Node: Distributed CVS315608 -Node: Files under CVS317522 -Node: autopoint Invocation320067 -Node: Programming Languages321859 -Node: Language Implementors322680 -Node: Programmers for other Languages327506 -Node: Translators for other Languages328072 -Node: c-format329109 -Node: python-format329620 -Node: lisp-format330046 -Node: elisp-format330361 -Node: librep-format330840 -Node: smalltalk-format331232 -Node: java-format331721 -Node: awk-format332153 -Node: object-pascal-format332463 -Node: ycp-format332679 -Node: tcl-format333065 -Node: Maintainers for other Languages333327 -Node: List of Programming Languages334554 -Node: C335677 -Node: sh336658 -Node: bash337284 -Node: Python337969 -Node: Common Lisp339031 -Node: clisp C339745 -Node: Emacs Lisp340467 -Node: librep341173 -Node: Smalltalk341824 -Node: Java342897 -Node: gawk345567 -Node: Pascal346394 -Node: wxWindows347610 -Node: YCP348344 -Node: Tcl349003 -Node: Perl350306 -Node: PHP350924 -Node: Pike351627 -Node: List of Data Formats352253 -Node: POT352712 -Node: RST352956 -Node: Glade353168 -Node: Conclusion353446 -Node: History353946 -Node: References358048 -Node: Language Codes359603 -Node: Country Codes363542 -Node: Program Index369262 -Node: Option Index370626 -Node: Variable Index397033 -Node: PO Mode Index398135 -Node: Autoconf Macro Index407493 -Node: Index407816 +Node: Top2520 +Node: Introduction12918 +Node: Why14776 +Ref: Why-Footnote-117883 +Node: Concepts18039 +Node: Aspects21452 +Node: Files27290 +Node: Overview29191 +Node: Basics39983 +Node: Installation40813 +Node: PO Files42755 +Ref: PO Files-Footnote-150161 +Node: Main PO Commands50288 +Node: Entry Positioning55358 +Node: Normalizing60812 +Node: Sources65265 +Node: Triggering66598 +Node: Preparing Strings69628 +Node: Mark Keywords76506 +Node: Marking80061 +Node: c-format Flag87782 +Node: Special cases91693 +Node: Template94426 +Node: xgettext Invocation95147 +Node: Creating102199 +Node: msginit Invocation103080 +Node: Header Entry104946 +Node: Updating111352 +Node: msgmerge Invocation112107 +Node: Translated Entries116205 +Node: Fuzzy Entries117559 +Node: Untranslated Entries120728 +Node: Obsolete Entries122648 +Node: Modifying Translations125861 +Node: Modifying Comments133818 +Node: Subedit138231 +Node: C Sources Context142113 +Node: Auxiliary147223 +Node: Compendium150448 +Node: Creating Compendia151058 +Node: Using Compendia153497 +Node: Manipulating154385 +Node: msgcat Invocation157865 +Node: msgconv Invocation161340 +Node: msggrep Invocation163746 +Node: msgfilter Invocation167673 +Node: msguniq Invocation171767 +Node: msgcomm Invocation174883 +Node: msgcmp Invocation178153 +Node: msgattrib Invocation179383 +Node: msgen Invocation182744 +Node: msgexec Invocation185340 +Node: Binaries187391 +Node: msgfmt Invocation187723 +Node: msgunfmt Invocation193455 +Node: MO Files196382 +Node: Users204473 +Node: Matrix205956 +Node: Installers207160 +Node: End Users208330 +Node: Programmers208979 +Node: catgets210152 +Node: Interface to catgets211555 +Node: Problems with catgets213559 +Node: gettext214460 +Node: Interface to gettext215918 +Node: Ambiguities218257 +Node: Locating Catalogs220950 +Ref: Locating Catalogs-Footnote-1222097 +Ref: Locating Catalogs-Footnote-2222322 +Node: Charset conversion222471 +Node: Plural forms224913 +Ref: Plural forms-Footnote-1235506 +Node: GUI program problems235598 +Node: Optimized gettext240702 +Node: Comparison242035 +Node: Using libintl.a246305 +Node: gettext grok246738 +Node: Temp Programmers249287 +Node: Temp Implementations249727 +Node: Temp catgets251093 +Node: Temp WSI252780 +Node: Temp Notes254768 +Node: Translators255257 +Node: Trans Intro 0255636 +Node: Trans Intro 1258285 +Node: Discussions260149 +Node: Organization263648 +Node: Central Coordination265629 +Node: National Teams266757 +Node: Sub-Cultures269269 +Node: Organizational Ideas270188 +Node: Mailing Lists271191 +Node: Information Flow272994 +Node: Maintainers275127 +Node: Flat and Non-Flat277024 +Node: Prerequisites278507 +Node: gettextize Invocation282648 +Node: Adjusting Files289351 +Node: po/POTFILES.in291080 +Node: po/LINGUAS292325 +Node: po/Makevars293107 +Node: configure.in294693 +Node: config.guess296803 +Node: mkinstalldirs297919 +Node: aclocal298680 +Node: acconfig300318 +Node: config.h.in300804 +Node: Makefile301961 +Node: src/Makefile304542 +Node: lib/gettext.h307557 +Node: autoconf macros309782 +Node: AM_GNU_GETTEXT310352 +Node: AM_GNU_GETTEXT_VERSION314081 +Node: AM_ICONV314511 +Node: CVS Issues316705 +Node: Distributed CVS317259 +Node: Files under CVS319173 +Node: autopoint Invocation321731 +Node: Programming Languages323533 +Node: Language Implementors324354 +Node: Programmers for other Languages329180 +Node: Translators for other Languages329746 +Node: c-format330834 +Node: python-format331345 +Node: lisp-format331771 +Node: elisp-format332086 +Node: librep-format332565 +Node: smalltalk-format332957 +Node: java-format333446 +Node: awk-format333878 +Node: object-pascal-format334188 +Node: ycp-format334404 +Node: tcl-format334790 +Node: php-format335071 +Node: Maintainers for other Languages335394 +Node: List of Programming Languages336621 +Node: C337744 +Node: sh338809 +Node: bash339435 +Node: Python340120 +Node: Common Lisp341182 +Node: clisp C341896 +Node: Emacs Lisp342618 +Node: librep343324 +Node: Smalltalk343975 +Node: Java344917 +Node: gawk347587 +Node: Pascal348414 +Node: wxWindows349630 +Node: YCP350364 +Node: Tcl351023 +Node: Perl352326 +Node: PHP352944 +Node: Pike353724 +Node: List of Data Formats354350 +Node: POT354809 +Node: RST355053 +Node: Glade355265 +Node: Conclusion355543 +Node: History356043 +Node: References360145 +Node: Language Codes361700 +Node: Country Codes365639 +Node: Program Index371359 +Node: Option Index372723 +Node: Variable Index399192 +Node: PO Mode Index400294 +Node: Autoconf Macro Index409652 +Node: Index409975  End Tag Table diff --git a/doc/gettext.info-1 b/doc/gettext.info-1 index 03175b4dd..22cc54a2d 100644 --- a/doc/gettext.info-1 +++ b/doc/gettext.info-1 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -37,7 +52,7 @@ GNU `gettext' utilities *********************** This manual document the GNU gettext tools and the GNU libintl -library, version 0.11.4. +library, version 0.11.6-pre2. * Menu: @@ -254,6 +269,7 @@ The Translator's View * object-pascal-format:: Object Pascal Format Strings * ycp-format:: YCP Format Strings * tcl-format:: Tcl Format Strings +* php-format:: PHP Format Strings Individual Programming Languages diff --git a/doc/gettext.info-10 b/doc/gettext.info-10 index 6a2631e6c..5fafd452b 100644 --- a/doc/gettext.info-10 +++ b/doc/gettext.info-10 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It diff --git a/doc/gettext.info-2 b/doc/gettext.info-2 index e8660a8f3..7654c160d 100644 --- a/doc/gettext.info-2 +++ b/doc/gettext.info-2 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It diff --git a/doc/gettext.info-3 b/doc/gettext.info-3 index 1f76e5249..18c338a70 100644 --- a/doc/gettext.info-3 +++ b/doc/gettext.info-3 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -86,7 +101,8 @@ Choice of input file language `--language=NAME' Specifies the language of the input files. The supported languages are `C', `C++', `ObjectiveC', `PO', `Python', `Lisp', `EmacsLisp', - `librep', `Java', `awk', `YCP', `Tcl', `RST', `Glade'. + `librep', `Smalltalk', `Java', `awk', `YCP', `Tcl', `PHP', `RST', + `Glade'. `-C' `--c++' @@ -95,6 +111,18 @@ Choice of input file language By default the language is guessed depending on the input file name extension. +Input file interpretation +------------------------- + +`--from-code=NAME' + Specifies the encoding of the input files. This option is needed + only if some untranslated message strings or their corresponding + comments contain non-ASCII characters. Note that Python, Tcl, and + Glade input files are always assumed to be in UTF-8, regardless of + this option. + + By default the input files are assumed to be in ASCII. + Operation mode -------------- @@ -264,7 +292,7 @@ example: $ cd PACKAGE-VERSION $ cd po - $ msginit --verbose + $ msginit The alternative way is to do the copy and modifications by hand. To do so, the translator copies `PACKAGE.pot' to `LANG.po'. Then she diff --git a/doc/gettext.info-4 b/doc/gettext.info-4 index 2aa52d8a2..5abe6086e 100644 --- a/doc/gettext.info-4 +++ b/doc/gettext.info-4 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It diff --git a/doc/gettext.info-5 b/doc/gettext.info-5 index 045cb8ddb..777e51352 100644 --- a/doc/gettext.info-5 +++ b/doc/gettext.info-5 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It diff --git a/doc/gettext.info-6 b/doc/gettext.info-6 index 73dfa7a5a..eeadcb975 100644 --- a/doc/gettext.info-6 +++ b/doc/gettext.info-6 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It diff --git a/doc/gettext.info-7 b/doc/gettext.info-7 index 0f2c1b98a..be3288dfb 100644 --- a/doc/gettext.info-7 +++ b/doc/gettext.info-7 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -197,7 +212,7 @@ each. So, here comes a list of files, each one followed by a description of all alterations it needs. Many examples are taken out from the GNU -`gettext' 0.11.4 distribution itself, or from the GNU `hello' +`gettext' 0.11.6-pre2 distribution itself, or from the GNU `hello' distribution (`http://www.franken.de/users/gnu/ke/hello' or `http://www.gnu.franken.de/ke/hello/') You may indeed refer to the source code of the GNU `gettext' and GNU `hello' packages, as they are @@ -317,7 +332,7 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars This is done by a set of lines like these: PACKAGE=gettext - VERSION=0.11.4 + VERSION=0.11.6-pre2 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -325,12 +340,12 @@ File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars or, if you are using GNU `automake', by a line like this: - AM_INIT_AUTOMAKE(gettext, 0.11.4) + AM_INIT_AUTOMAKE(gettext, 0.11.6-pre2) Of course, you replace `gettext' with the name of your package, - and `0.11.4' by its version numbers, exactly as they should appear - in the packaged `tar' file name of your distribution - (`gettext-0.11.4.tar.gz', here). + and `0.11.6-pre2' by its version numbers, exactly as they should + appear in the packaged `tar' file name of your distribution + (`gettext-0.11.6-pre2.tar.gz', here). 2. Check for internationalization support. @@ -420,10 +435,10 @@ simplest is to concatenate the files `codeset.m4', `gettext.m4', `glibc21.m4', `iconv.m4', `intdiv0.m4', `inttypes.m4', `inttypes_h.m4', `inttypes-pri.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `progtest.m4', `stdint_h.m4', -`uintmax_t.m4' from GNU `gettext''s `m4/' directory into a single file. -If you have suppressed the `intl/' directory, only `gettext.m4', -`iconv.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', `progtest.m4' -need to be concatenated. +`uintmax_t.m4', `ulonglong.m4' from GNU `gettext''s `m4/' directory +into a single file. If you have suppressed the `intl/' directory, only +`gettext.m4', `iconv.m4', `lib-ld.m4', `lib-link.m4', `lib-prefix.m4', +`progtest.m4' need to be concatenated. If you already have an `aclocal.m4' file, then you will have to merge the said macro files into your `aclocal.m4'. Note that if you @@ -933,7 +948,7 @@ repository all the files that `gettextize' mentions as "copy". Instead, he adds to the `configure.in' or `configure.ac' a line of the form - GETTEXT_VERSION=0.11.4 + AM_GNU_GETTEXT_VERSION(0.11.6-pre2) and adds to the package's pre-build script an invocation of `autopoint'. For everyone who checks out the CVS, this `autopoint' @@ -978,9 +993,9 @@ Informative output Output version information and exit. `autopoint' supports the GNU `gettext' versions from 0.10.35 to the -current one, 0.11.4. In order to apply `autopoint' to a package using -a `gettext' version newer than 0.11.4, you need to install this same -version of GNU `gettext' at least. +current one, 0.11.6-pre2. In order to apply `autopoint' to a package +using a `gettext' version newer than 0.11.6-pre2, you need to install +this same version of GNU `gettext' at least. In packages using GNU `automake', an invocation of `autopoint' should be followed by invocations of `aclocal' and then `autoconf' and @@ -1144,6 +1159,7 @@ strings. * object-pascal-format:: Object Pascal Format Strings * ycp-format:: YCP Format Strings * tcl-format:: Tcl Format Strings +* php-format:: PHP Format Strings  File: gettext.info, Node: c-format, Next: python-format, Prev: Translators for other Languages, Up: Translators for other Languages diff --git a/doc/gettext.info-8 b/doc/gettext.info-8 index 99a9d5196..6ccb66cc2 100644 --- a/doc/gettext.info-8 +++ b/doc/gettext.info-8 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -95,7 +110,7 @@ directive starts with `%' and is followed by `%' or a nonzero digit (`1' to `9').  -File: gettext.info, Node: tcl-format, Prev: ycp-format, Up: Translators for other Languages +File: gettext.info, Node: tcl-format, Next: php-format, Prev: ycp-format, Up: Translators for other Languages Tcl Format Strings ------------------ @@ -103,6 +118,16 @@ Tcl Format Strings Tcl format strings are described in the `format.n' manual page, `http://www.scriptics.com/man/tcl8.3/TclCmd/format.htm'. + +File: gettext.info, Node: php-format, Prev: tcl-format, Up: Translators for other Languages + +PHP Format Strings +------------------ + + PHP format strings are described in the documentation of the PHP +function `sprintf', in `phpdoc/manual/function.sprintf.html' or +`http://www.php.net/manual/en/function.sprintf.php'. +  File: gettext.info, Node: Maintainers for other Languages, Next: List of Programming Languages, Prev: Translators for other Languages, Up: Programming Languages @@ -202,6 +227,8 @@ Extractor Formatting with positions `fprintf "%2$d %1$d"' (POSIX but not C 99) + In C++: `autosprintf "%2$d %1$d"' (*note Introduction: + (autosprintf)Top.) Portability autoconf (gettext.m4) and #if ENABLE_NLS @@ -565,37 +592,34 @@ File extension `st' String syntax - `''abc''' + `'abc'' gettext shorthand - `NLS? ''abc''' - `self? ''abc''' + `NLS ? 'abc'' gettext/ngettext functions `LcMessagesDomain>>#at:', `LcMessagesDomain>>#at:plural:with:' textdomain - `LcMessages>>#?' (returns a `LcMessagesDomain' object). - Example: `Locale default messages ? 'gettext'' + `LcMessages>>#domain:localeDirectory:' (returns a + `LcMessagesDomain' object). + Example: `I18N Locale default messages domain: 'gettext' + localeDirectory: /usr/local/share/locale'' bindtextdomain - `LcMessages>>#domain:directory:' (returns a `LcMessagesDomain' - object) + `LcMessages>>#domain:localeDirectory:', see above. setlocale - You can obtain any `Locale' object from `Locale' class methods - such as `#fromString:' or `#default'. - Example: `Locale default messages' gives the `LcMessages' object - for the default locale. + Automatic if you use `I18N Locale default'. Prerequisite - The gettext code is contained in the `I18N' package. + `PackageLoader fileInPackage: 'I18N'!' Use or emulate GNU gettext emulate Extractor - -- + `xgettext' Formatting with positions `'%1 %2' bindWith: 'Hello' with: 'world'' @@ -1013,13 +1037,13 @@ PHP Hypertext Preprocessor -------------------------- RPMs - mod_php4, phplib, phpdoc + mod_php4, mod_php4-core, phplib, phpdoc File extension `php', `php3', `php4' String syntax - `"abc"' + `"abc"', `'abc'' gettext shorthand `_("abc")' @@ -1034,7 +1058,7 @@ bindtextdomain `bindtextdomain' function setlocale - `setlocale' function + Programmer must call `setlocale (LC_ALL, "")' Prerequisite -- @@ -1043,10 +1067,10 @@ Use or emulate GNU gettext use Extractor - -- + `xgettext' Formatting with positions - -- + `printf "%2\$d %1\$d"' Portability On platforms without gettext, the functions are not available. diff --git a/doc/gettext.info-9 b/doc/gettext.info-9 index a38ee84c3..2a3290970 100644 --- a/doc/gettext.info-9 +++ b/doc/gettext.info-9 @@ -1,13 +1,28 @@ -This is gettext.info, produced by makeinfo version 4.0 from +This is gettext.info, produced by makeinfo version 4.2 from gettext.texi. INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* gettext: (gettext). GNU gettext utilities. +* autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. +* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. +* msgattrib: (gettext)msgattrib Invocation. Select part of a PO file. +* msgcat: (gettext)msgcat Invocation. Combine several PO files. +* msgcmp: (gettext)msgcmp Invocation. Compare a PO file and template. +* msgcomm: (gettext)msgcomm Invocation. Match two PO files. +* msgconv: (gettext)msgconv Invocation. Convert PO file to encoding. +* msgen: (gettext)msgen Invocation. Create an English PO file. +* msgexec: (gettext)msgexec Invocation. Process a PO file. +* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter. +* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. +* msggrep: (gettext)msggrep Invocation. Select part of a PO file. +* msginit: (gettext)msginit Invocation. Create a fresh PO file. +* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template. +* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file. +* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file. +* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* ISO639: (gettext)Language Codes. ISO 639 language codes. +* ISO3166: (gettext)Country Codes. ISO 3166 country codes. END-INFO-DIR-ENTRY This file provides documentation for GNU `gettext' utilities. It @@ -105,6 +120,7 @@ Option Index * --force-po, msguniq option: msguniq Invocation. * --force-po, xgettext option: xgettext Invocation. * --foreign-user, xgettext option: xgettext Invocation. +* --from-code, xgettext option: xgettext Invocation. * --fuzzy, msgattrib option: msgattrib Invocation. * --help, autopoint option: autopoint Invocation. * --help, gettextize option: gettextize Invocation. diff --git a/doc/gettext_1.html b/doc/gettext_1.html index 0b8f7b9b9..988e875a2 100644 --- a/doc/gettext_1.html +++ b/doc/gettext_1.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 1 Introduction @@ -176,7 +176,7 @@ by which the programs are untied from calling only English strings or other English specific habits, and connected to generic ways of doing the same, instead. Program developers may use various techniques to internationalize their programs. Some of these have been standardized. -GNU gettext offers one of these standards. See section 10 The Programmer's View. +GNU gettext offers one of these standards. See section 10 The Programmer's View.

@@ -560,7 +560,7 @@ a Template PO file, not yet oriented towards any particular language. See section 4.1 Invoking the xgettext Program, for more details about how one calls the xgettext program. If you are really lazy, you might be interested at working a lot more right away, and preparing the -whole distribution setup (see section 12 The Maintainer's View). By doing so, you +whole distribution setup (see section 12 The Maintainer's View). By doing so, you spare yourself typing the xgettext command, as make should now generate the proper things automatically for you! @@ -569,7 +569,7 @@ should now generate the proper things automatically for you! The first time through, there is no `lang.po´ yet, so the msgmerge step may be skipped and replaced by a mere copy of `package.pot´ to `lang.po´, where lang -represents the target language. See section 5 Creating a New PO File for details. +represents the target language. See section 5 Creating a New PO File for details.

@@ -577,7 +577,7 @@ Then comes the initial translation of messages. Translation in itself is a whole matter, still exclusively meant for humans, and whose complexity far overwhelms the level of this manual. Nevertheless, a few hints are given in some other chapter of this -manual (see section 11 The Translator's View). You will also find there indications +manual (see section 11 The Translator's View). You will also find there indications about how to contact translating teams, or becoming part of them, for sharing your translating concerns with others who target the same native language. @@ -594,14 +594,14 @@ of PO file format are taken care of for you, but you have to acquire some familiarity with PO mode itself. Besides main PO mode commands (see section 2.3 Main PO mode Commands), you should know how to move between entries (see section 2.4 Entry Positioning), and how to handle untranslated entries -(see section 6.4 Untranslated Entries). +(see section 6.4 Untranslated Entries).

If some common translations have already been saved into a compendium PO file, translators may use PO mode for initializing untranslated entries from the compendium, and also save selected translations into -the compendium, updating it (see section 6.11 Using Translation Compendia). Compendium files +the compendium, updating it (see section 6.11 Using Translation Compendia). Compendium files are meant to be exchanged between members of a given translation team.

@@ -647,8 +647,8 @@ out of recent C sources. The refreshing operation adjusts all references to C source locations for strings, since these strings move as programs are modified. Also, msgmerge comments out as obsolete, in `lang.po´, those already translated entries -which are no longer used in the program sources (see section 6.5 Obsolete Entries). It finally discovers new strings and inserts them in -the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what +which are no longer used in the program sources (see section 6.5 Obsolete Entries). It finally discovers new strings and inserts them in +the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what msgmerge really does.

@@ -678,7 +678,7 @@ distribution. Once the PO file is complete and dependable, the msgfmt program is used for turning the PO file into a machine-oriented format, which may yield efficient retrieval of translations by the programs of the -package, whenever needed at runtime (see section 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution +package, whenever needed at runtime (see section 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution for the msgfmt program.

@@ -688,7 +688,7 @@ with the GNU gettext library, usually through the operation of make, given a suitable `Makefile´ exists for the project, and the resulting executable is installed somewhere users will find it. The MO files themselves should also be properly installed. Given the -appropriate environment variables are set (see section 9.3 Magic for End Users), the +appropriate environment variables are set (see section 9.3 Magic for End Users), the program should localize itself automatically, whenever it executes.

diff --git a/doc/gettext_10.html b/doc/gettext_10.html index 5f6ff87e3..cfda47917 100644 --- a/doc/gettext_10.html +++ b/doc/gettext_10.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 10 The Programmer's View @@ -10,7 +10,7 @@ Go to the first, previous<

-

10 The Programmer's View

+

10 The Programmer's View

One aim of the current message catalog implementation provided by @@ -28,9 +28,9 @@ later explain our solution of this dilemma. -

10.1 About catgets

+

10.1 About catgets

- +

@@ -63,9 +63,9 @@ therefore part of all Unix implementation (implementations, which are -

10.1.1 The Interface

+

10.1.1 The Interface

- +

@@ -78,7 +78,7 @@ for the functions and the needed definitions are in the

- + catopen is used like in this:

@@ -97,7 +97,7 @@ message catalog, equivalent to handles to file returned by open.

- + This handle is of course used in the catgets function which can be used like this: @@ -129,7 +129,7 @@ should better be const char *, but the standard is published in

- + The last of these function functions is used and behaves as expected:

@@ -144,9 +144,9 @@ After this no catgets call using the descriptor is legal anymore.

-

10.1.2 Problems with the catgets Interface?!

+

10.1.2 Problems with the catgets Interface?!

- +

@@ -165,9 +165,9 @@ more easy to manage.

-

10.2 About gettext

+

10.2 About gettext

- +

@@ -182,7 +182,7 @@ The main points about this solution is that it does not follow the method of normal file handling (open-use-close) and that it does not burden the programmer so many task, especially the unique key handling. Of course here also a unique key is needed, but this key is the message -itself (how long or short it is). See section 10.3 Comparing the Two Interfaces for a more +itself (how long or short it is). See section 10.3 Comparing the Two Interfaces for a more detailed comparison of the two methods.

@@ -196,9 +196,9 @@ in using this library will be interested in this description. -

10.2.1 The Interface

+

10.2.1 The Interface

- +

@@ -267,11 +267,11 @@ your language.

-

10.2.2 Solving Ambiguities

+

10.2.2 Solving Ambiguities

- +

@@ -345,9 +345,9 @@ unreliabilities.

-

10.2.3 Locating Message Catalog Files

+

10.2.3 Locating Message Catalog Files

- +

@@ -385,10 +385,10 @@ The value of the locale is determined through

-

10.2.4 How to specify the output character set gettext uses

+

10.2.4 How to specify the output character set gettext uses

- +

@@ -420,7 +420,7 @@ recommended that all msgids be US-ASCII strings.

Function: char * bind_textdomain_codeset (const char *domainname, const char *codeset) -
+
The bind_textdomain_codeset function can be used to specify the output character set for message catalogs for domain domainname. The codeset argument must be a valid codeset name which can be used @@ -452,9 +452,9 @@ global variable errno is set accordingly.

-

10.2.5 Additional functions for plural forms

+

10.2.5 Additional functions for plural forms

- +

@@ -574,7 +574,7 @@ purpose.

Function: char * ngettext (const char *msgid1, const char *msgid2, unsigned long int n) -
+
The ngettext function is similar to the gettext function as it finds the message catalogs in the same way. But it takes two extra arguments. The msgid1 parameter must contain the singular @@ -604,7 +604,7 @@ Please note that the numeric value n has to be passed to the

Function: char * dngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n) -
+
The dngettext is similar to the dgettext function in the way the message catalog is selected. The difference is that it takes two extra parameter to provide the correct plural form. These two @@ -615,7 +615,7 @@ parameters are handled in the same way ngettext handles them.

Function: char * dcngettext (const char *domain, const char *msgid1, const char *msgid2, unsigned long int n, int category) -
+
The dcngettext is similar to the dcgettext function in the way the message catalog is selected. The difference is that it takes two extra parameter to provide the correct plural form. These two @@ -640,9 +640,9 @@ possibility of extensions to not prevent the use of new languages).

- + The information about the plural form selection has to be stored in the header entry of the PO file (the one with the empty msgid string). The plural form information looks like this: @@ -668,7 +668,7 @@ value of nplurals.

- + The following rules are known at this point. The language with families are listed. But this does not necessarily mean the information can be generalized for the whole family (as can be easily seen in the table @@ -876,11 +876,11 @@ Slovenian -

10.2.6 How to use gettext in GUI programs

+

10.2.6 How to use gettext in GUI programs

- +

@@ -957,7 +957,7 @@ fine:

- + 

   char *
@@ -1032,9 +1032,9 @@ quite some memory and disk space by doing this.
 

 
 
-
10.2.7  Optimization of the *gettext functions

+
10.2.7  Optimization of the *gettext functions

 

-
+
 
 

 

@@ -1087,10 +1087,10 @@ find the result through a single cache lookup.
 

 
 
-
10.3  Comparing the Two Interfaces

+
10.3  Comparing the Two Interfaces

 

-
 
+
 
 

 
@@ -1140,7 +1140,7 @@ by
 
 

 

-
+
 
 
 #include <libintl.h>
@@ -1155,7 +1155,7 @@ can use any that becomes available.
 
 

 

-
+
 The same procedure can be done for the gettext_noop invocations
 (see section 3.6  Special Cases of Translatable Strings).  One usually defines gettext_noop as a
 no-op macro.  So you should consider the following code for your project:
@@ -1234,12 +1234,12 @@ little bit.  But it is not impossible to overcome.
 

 catgets allows same original entry to have different translations,
 but gettext has another, scalable approach for solving ambiguities
-of this kind: See section 10.2.2  Solving Ambiguities.
+of this kind: See section 10.2.2  Solving Ambiguities.
 
 

 
 
-
10.4  Using libintl.a in own programs

+
10.4  Using libintl.a in own programs

 
 

 Starting with version 0.9.4 the library libintl.h should be
@@ -1250,7 +1250,7 @@ and the library in directories selected using the $(prefix).
 

 
 
-
10.5  Being a gettext grok

+
10.5  Being a gettext grok

 
 

 To fully exploit the functionality of the GNU gettext library it
@@ -1263,7 +1263,7 @@ is a list comments:
 
    
 
  • Changing the language at runtime
 
-
+
 
 For interactive programs it might be useful to offer a selection of the
 used language at runtime.  To understand how to do this one need to know
@@ -1280,20 +1280,20 @@ priority:
 
      
 
    1. LANGUAGE
 
-
- 
 
+ 
+
 
    2. LC_ALL
 
-
 
 
 
 
 
+
 
    3. LC_xxx, according to selected locale
 
-
+
 
    4. LANG
 
 
    
@@ -1311,7 +1311,7 @@ But there is one little hook.  The code for gcc-2.7.0 and up provides
 some optimization.  This optimization normally prevents the calling of
 the dcgettext function as long as no new catalog is loaded.  But
 if dcgettext is not called the program also cannot find the
-LANGUAGE variable be changed (see section 10.2.7  Optimization of the *gettext functions).  A
+LANGUAGE variable be changed (see section 10.2.7  Optimization of the *gettext functions).  A
 solution for this is very easy.  Include the following code in the
 language switching function.
 
@@ -1327,7 +1327,7 @@ language switching function.
   }
 

 
-
+
 The variable _nl_msg_cat_cntr is defined in `loadmsgcat.c´.
 You don't need to know what this is for. But it can be used to detect
 whether a gettext implementation is GNU gettext and not non-GNU
@@ -1337,11 +1337,11 @@ system's native gettext implementation.
 
 
 
-
10.6  Temporary Notes for the Programmers Chapter

+
10.6  Temporary Notes for the Programmers Chapter

 
 
 
-
10.6.1  Temporary - Two Possible Implementations

+
10.6.1  Temporary - Two Possible Implementations

 
 

 There are two competing methods for language independent messages:
@@ -1373,7 +1373,7 @@ see the Programming for Internationalization FAQ.
 

 
 
-
10.6.2  Temporary - About catgets

+
10.6.2  Temporary - About catgets

 
 

 There have been a few discussions of late on the use of
@@ -1418,7 +1418,7 @@ of all Unix systems.
 

 
 
-
10.6.3  Temporary - Why a single implementation

+
10.6.3  Temporary - Why a single implementation

 
 

 Now it seems kind of wasteful to me to have two different systems
@@ -1463,7 +1463,7 @@ the future.
 

 
 
-
10.6.4  Temporary - Notes

+
10.6.4  Temporary - Notes

 
 

 X/Open agreed very late on the standard form so that many
diff --git a/doc/gettext_11.html b/doc/gettext_11.html
index 9a31cb9e5..0c1b02290 100644
--- a/doc/gettext_11.html
+++ b/doc/gettext_11.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 5 November 2002 -->
 
 GNU gettext utilities - 11  The Translator's View
 
@@ -10,11 +10,11 @@ Go to the first, previous
 

 
 
-
11  The Translator's View

+
11  The Translator's View

 
 
 
-
11.1  Introduction 0

+
11.1  Introduction 0

 
 

 Free software is going international!  The Translation Project is a way
@@ -92,7 +92,7 @@ you can work on.
 

 
 
-
11.2  Introduction 1

+
11.2  Introduction 1

 
 

 This is now official, GNU is going international!  Here is the
@@ -142,7 +142,7 @@ document, please e-mail to `translation@iro.umontreal.ca´.
 

 
 
-
11.3  Discussions

+
11.3  Discussions

 
 

 Facing this internationalization effort, a few users expressed their
@@ -219,7 +219,7 @@ software.
 
 
 
-
11.4  Organization

+
11.4  Organization

 
 

 On a larger scale, the true solution would be to organize some kind of
@@ -263,7 +263,7 @@ reaches the Translation Project coordinator.
 
 
 
-
11.4.1  Central Coordination

+
11.4.1  Central Coordination

 
 

 I also think GNU will need sooner than it thinks, that someone setup
@@ -288,7 +288,7 @@ overwhelming task, the time to put delegations in place.
 

 
 
-
11.4.2  National Teams

+
11.4.2  National Teams

 
 

 I suggest we look for volunteer coordinators/editors for individual
@@ -351,7 +351,7 @@ consistent.
 
 
 
-
11.4.2.1  Sub-Cultures

+
11.4.2.1  Sub-Cultures

 
 

 Taking French for example, there are a few sub-cultures around computers
@@ -373,7 +373,7 @@ means soon!
 

 
 
-
11.4.2.2  Organizational Ideas

+
11.4.2.2  Organizational Ideas

 
 

 I expect the next big changes after the official release.  Please note
@@ -410,7 +410,7 @@ this also seems to work).
 
 
 
-
11.4.3  Mailing Lists

+
11.4.3  Mailing Lists

 
 

 If we get any inquiries about GNU gettext, send them on to:
@@ -464,7 +464,7 @@ subscribe as they see fit, as long as each team is represented in it.
 

 
 
-
11.5  Information Flow

+
11.5  Information Flow

 
 

 There will surely be some discussion about this messages after the
diff --git a/doc/gettext_12.html b/doc/gettext_12.html
index 8bb615079..7faffe4b0 100644
--- a/doc/gettext_12.html
+++ b/doc/gettext_12.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 5 November 2002 -->
 
 GNU gettext utilities - 12  The Maintainer's View
 
@@ -10,15 +10,15 @@ Go to the first, previous
 

 
 
-
12  The Maintainer's View

+
12  The Maintainer's View

 

-
+
 
 

 

 The maintainer of a package has many responsibilities.  One of them
 is ensuring that the package will install easily on many platforms,
-and that the magic we described earlier (see section 9  The User's View) will work
+and that the magic we described earlier (see section 9  The User's View) will work
 for installers and end users.
 
 

@@ -52,7 +52,7 @@ for changes.
 
 
 
-
12.1  Flat or Non-Flat Directory Structures

+
12.1  Flat or Non-Flat Directory Structures

 
 

 Some free software packages are distributed as tar files which unpack
@@ -85,11 +85,11 @@ use this as an opportunity to unflatten their package structure.
 

 
 
-
12.2  Prerequisite Works

+
12.2  Prerequisite Works

 

-
 
 
+
 
 

 

@@ -186,7 +186,7 @@ never try to solve a team's problem on your own.
 

 
 
-
12.3  Invoking the gettextize Program

+
12.3  Invoking the gettextize Program

 
 

 The gettextize program is an interactive tool that helps the
@@ -221,7 +221,7 @@ GNU gettext.
 
 
  • It performs as many of the tasks mentioned in the next section
 
-section 12.4  Files You Must Create or Alter as can be performed automatically.
+section 12.4  Files You Must Create or Alter as can be performed automatically.
 
 
  • It removes obsolete files and idioms used for previous GNU
 
@@ -238,8 +238,8 @@ It can be invoked as follows:
 
 
    
 
    
-
 
+
 
 
     gettextize [ option... ] [ directory ]
@@ -255,8 +255,8 @@ and accepts the following options:
 
    
 
    `--copy´
 
    
-
 
+
 Copy the needed files instead of making symbolic links.  Using links
 would allow the package to always use the latest gettext code
 available on the system, but it might disturb some mechanism the
@@ -267,13 +267,13 @@ maintainer is used to apply to the sources.  Because running
 
    
 
    `--force´
 
    
-
 
+
 Force replacement of files which already exist.
 
 
    `--intl´
 
    
-
+
 Install the libintl sources in a subdirectory named `intl/´.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed. If this option is omitted,
@@ -283,7 +283,7 @@ be enabled on systems lacking GNU gettext.
 
 
    `--no-changelog´
 
    
-
+
 Don't update or create ChangeLog files.  By default, gettextize
 logs all changes (file additions, modifications and removals) in a
 file called `ChangeLog´ in each affected directory.
@@ -292,20 +292,20 @@ file called `ChangeLog´ in each affected directory.
 
    
 
    `--dry-run´
 
    
-
 
+
 Print modifications but don't perform them.  All actions that
 gettextize would normally execute are inhibited and instead only
 listed on standard output.
 
 
    `--help´
 
    
-
+
 Display this help and exit.
 
 
    `--version´
 
    
-
+
 Output version information and exit.
    • @@ -408,7 +408,7 @@ It is important to understand that gettextize can not do the entire job of adapting a package for using GNU gettext. The amount of remaining work depends on whether the package uses GNU automake or not. But in any case, the maintainer should still -read the section section 12.4 Files You Must Create or Alter after invoking gettextize. +read the section section 12.4 Files You Must Create or Alter after invoking gettextize.

    @@ -416,14 +416,14 @@ It is also important to understand that gettextize is not part of the GNU build system, in the sense that it should not be invoked automatically, and not be invoked by someone who doesn't assume the responsibilities of a package maintainer. For the latter purpose, a -separate tool is provided, see section 12.6.3 Invoking the autopoint Program. +separate tool is provided, see section 12.6.3 Invoking the autopoint Program.

    -

    12.4 Files You Must Create or Alter

    +

    12.4 Files You Must Create or Alter

    - +

    @@ -438,7 +438,7 @@ changes needed in each.

    So, here comes a list of files, each one followed by a description of all alterations it needs. Many examples are taken out from the GNU -gettext 0.11.4 distribution itself, or from the GNU +gettext 0.11.6-pre2 distribution itself, or from the GNU hello distribution (http://www.franken.de/users/gnu/ke/hello or http://www.gnu.franken.de/ke/hello/) You may indeed refer to the source code of the GNU gettext and GNU hello @@ -449,9 +449,9 @@ gettext functionality. -

    12.4.1 `POTFILES.in´ in `po/´

    +

    12.4.1 `POTFILES.in´ in `po/´

    - +

    @@ -495,9 +495,9 @@ case of bison), not the generated C file.

    -

    12.4.2 `LINGUAS´ in `po/´

    +

    12.4.2 `LINGUAS´ in `po/´

    - +

    @@ -519,14 +519,14 @@ that these languages are currently supported by your package. If you want to further restrict, at installation time, the set of installed languages, this should not be done by modifying the `LINGUAS´ file, but rather by using the LINGUAS environment variable -(see section 9.2 Magic for Installers). +(see section 9.2 Magic for Installers).

    -

    12.4.3 `Makefile´ pieces in `po/´

    +

    12.4.3 `Makefile´ pieces in `po/´

    - +

    @@ -546,8 +546,8 @@ needing to mess with `po/Makefile.in.in´.

    - + GNU gettext comes with a `Rules-quot´ file, containing rules for building catalogs `en@quot.po´ and `en@boldquot.po´. The effect of `en@quot.po´ is that people who set their LANGUAGE @@ -565,7 +565,7 @@ GUI programs. To enable it, similarly add en@boldquot to the

    -

    12.4.4 `configure.in´ at top level

    +

    12.4.4 `configure.in´ at top level

    `configure.in´ or `configure.ac´ - this is the source from which @@ -576,14 +576,14 @@ GUI programs. To enable it, similarly add en@boldquot to the

    1. Declare the package and version. - + This is done by a set of lines like these: 
       PACKAGE=gettext
-VERSION=0.11.4
+VERSION=0.11.6-pre2
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -594,13 +594,13 @@ or, if you are using GNU automake, by a line like this:
 
 
 
      -AM_INIT_AUTOMAKE(gettext, 0.11.4)
+AM_INIT_AUTOMAKE(gettext, 0.11.6-pre2)
 
      
 
 Of course, you replace `gettext´ with the name of your package,
-and `0.11.4´ by its version numbers, exactly as they
+and `0.11.6-pre2´ by its version numbers, exactly as they
 should appear in the packaged tar file name of your distribution
-(`gettext-0.11.4.tar.gz´, here).
+(`gettext-0.11.6-pre2.tar.gz´, here).
 
 
    2. Check for internationalization support.
 
@@ -647,7 +647,7 @@ add intl/Makefile to the AC_OUTPUT line.
 
 
 
-
      12.4.5  `config.guess´, `config.sub´ at top level
      
+
      12.4.5  `config.guess´, `config.sub´ at top level
      
 
 
      
 If you haven't suppressed the `intl/´ subdirectory,
@@ -681,9 +681,9 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
 
-
      12.4.6  `mkinstalldirs´ at top level
      
+
      12.4.6  `mkinstalldirs´ at top level
      
 
      
-
+
 
 
      
 
      
@@ -708,9 +708,9 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
 
-
      12.4.7  `aclocal.m4´ at top level
      
+
      12.4.7  `aclocal.m4´ at top level
      
 
      
-
+
 
 
      
 
      
@@ -720,7 +720,8 @@ the simplest is to concatenate the files `codeset.m4´,
 `inttypes.m4´, `inttypes_h.m4´, `inttypes-pri.m4´,
 `isc-posix.m4´, `lcmessage.m4´, `lib-ld.m4´,
 `lib-link.m4´, `lib-prefix.m4´, `progtest.m4´,
-`stdint_h.m4´, `uintmax_t.m4´ from GNU gettext's
+`stdint_h.m4´, `uintmax_t.m4´, `ulonglong.m4´
+from GNU gettext's
 `m4/´ directory into a single file.  If you have suppressed the
 `intl/´ directory, only `gettext.m4´, `iconv.m4´,
 `lib-ld.m4´, `lib-link.m4´, `lib-prefix.m4´,
@@ -762,9 +763,9 @@ piece of m4 code will be the same for all projects using GNU
 
      
 
 
-
      12.4.8  `acconfig.h´ at top level
      
+
      12.4.8  `acconfig.h´ at top level
      
 
      
-
+
 
 
      
 
      
@@ -778,9 +779,9 @@ independently from the `intl/´ directory.
 
      
 
 
-
      12.4.9  `config.h.in´ at top level
      
+
      12.4.9  `config.h.in´ at top level
      
 
      
-
+
 
 
      
 
      
@@ -819,7 +820,7 @@ following lines to `config.h.in´:
 
 
 
-
      12.4.10  `Makefile.in´ at top level
      
+
      12.4.10  `Makefile.in´ at top level
      
 
 
      
 Here are a few modifications you need to make to your main, top-level
@@ -906,7 +907,7 @@ to `Makefile.am´ are already made by running `gettextize&ac
 
      
 
 
-
      12.4.11  `Makefile.in´ in `src/´
      
+
      12.4.11  `Makefile.in´ in `src/´
      
 
 
      
 Some of the modifications made in the main `Makefile.in´ will
@@ -1027,11 +1028,11 @@ dist: Makefile $(DISTFILES)
 
 
 
-
      12.4.12  `gettext.h´ in `lib/´
      
+
      12.4.12  `gettext.h´ in `lib/´
      
 
      
-
 
 
+
 
 
      
 
      
@@ -1068,7 +1069,7 @@ to 0 in C preprocessor expressions.
 
 
      
 
      
-
+
 `gettext.h´ is a convenience header file for conditional use of
 `<libintl.h>´, depending on the ENABLE_NLS macro. If
 ENABLE_NLS is set, it includes `<libintl.h>´; otherwise it
@@ -1107,9 +1108,9 @@ package that needs it should contain a copy of it on its own.
 
      
 
 
-
      12.5  Autoconf macros for use in `configure.in´
      
+
      12.5  Autoconf macros for use in `configure.in´
      
 
      
-
+
 
 
      
 
      
@@ -1122,10 +1123,10 @@ The primary macro is, of course, AM_GNU_GETTEXT.
 
 
 
-
      12.5.1  AM_GNU_GETTEXT in `gettext.m4´
      
+
      12.5.1  AM_GNU_GETTEXT in `gettext.m4´
      
 
 
      
-
+
 The AM_GNU_GETTEXT macro tests for the presence of the GNU gettext
 function family in either the C library or a separate libintl
 library (shared or static libraries are both supported) or in the package's
@@ -1194,7 +1195,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
    -

    13.5.11 GNU awk

    +

    13.5.11 GNU awk

    - +

    @@ -1147,11 +1155,11 @@ yourself. -

    13.5.12 Pascal - Free Pascal Compiler

    +

    13.5.12 Pascal - Free Pascal Compiler

    - +

    @@ -1223,9 +1231,9 @@ using the TranslateResourceStrings function in the gettext -

    13.5.13 wxWindows library

    +

    13.5.13 wxWindows library

    - +

    @@ -1289,10 +1297,10 @@ yes -

    13.5.14 YCP - YaST2 scripting language

    +

    13.5.14 YCP - YaST2 scripting language

    - +

    @@ -1356,10 +1364,10 @@ fully portable -

    13.5.15 Tcl - Tk's scripting language

    +

    13.5.15 Tcl - Tk's scripting language

    - +

    @@ -1437,9 +1445,9 @@ argument is given.

    -

    13.5.16 Perl

    +

    13.5.16 Perl

    - +

    @@ -1504,16 +1512,16 @@ use -

    13.5.17 PHP Hypertext Preprocessor

    +

    13.5.17 PHP Hypertext Preprocessor

    - +

    RPMs
    -mod_php4, phplib, phpdoc +mod_php4, mod_php4-core, phplib, phpdoc
    File extension
    @@ -1521,7 +1529,7 @@ mod_php4, phplib, phpdoc
    String syntax
    -"abc" +"abc", 'abc'
    gettext shorthand
    @@ -1541,7 +1549,7 @@ mod_php4, phplib, phpdoc
    setlocale
    -setlocale function +Programmer must call setlocale (LC_ALL, "")
    Prerequisite
    @@ -1553,11 +1561,11 @@ use
    Extractor
    ---- +xgettext
    Formatting with positions
    ---- +printf "%2\$d %1\$d"
    Portability
    @@ -1570,9 +1578,9 @@ On platforms without gettext, the functions are not available. -

    13.5.18 Pike

    +

    13.5.18 Pike

    - +

    @@ -1636,7 +1644,7 @@ On platforms without gettext, the functions are not available. -

    13.6 Internationalizable Data

    +

    13.6 Internationalizable Data

    Here is a list of other data formats which can be internationalized @@ -1646,7 +1654,7 @@ using GNU gettext. -

    13.6.1 POT - Portable Object Template

    +

    13.6.1 POT - Portable Object Template

    @@ -1665,9 +1673,9 @@ gettext -

    13.6.2 Resource String Table

    +

    13.6.2 Resource String Table

    - +

    @@ -1687,7 +1695,7 @@ fpk -

    13.6.3 Glade - GNOME user interface description

    +

    13.6.3 Glade - GNOME user interface description

    diff --git a/doc/gettext_14.html b/doc/gettext_14.html index 626fac6ff..c84fd6eb4 100644 --- a/doc/gettext_14.html +++ b/doc/gettext_14.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 14 Concluding Remarks @@ -10,7 +10,7 @@ Go to the first, previous

    -

    14 Concluding Remarks

    +

    14 Concluding Remarks

    We would like to conclude this GNU gettext manual by presenting @@ -22,9 +22,9 @@ about Native Language Support matters. -

    14.1 History of GNU gettext

    +

    14.1 History of GNU gettext

    - +

    @@ -121,10 +121,10 @@ manipulating PO files.

    -

    14.2 Related Readings

    +

    14.2 Related Readings

    - +

    diff --git a/doc/gettext_15.html b/doc/gettext_15.html index 357e33da3..538820c3b 100644 --- a/doc/gettext_15.html +++ b/doc/gettext_15.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - A Language Codes @@ -10,10 +10,10 @@ Go to the first, previous

    -

    A Language Codes

    +

    A Language Codes

    - +

    diff --git a/doc/gettext_16.html b/doc/gettext_16.html index c62c31be0..e6affcdcb 100644 --- a/doc/gettext_16.html +++ b/doc/gettext_16.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - B Country Codes @@ -10,10 +10,10 @@ Go to the first, previous

    -

    B Country Codes

    +

    B Country Codes

    - +

    diff --git a/doc/gettext_17.html b/doc/gettext_17.html index 4ce7dcdd7..1947cdbf9 100644 --- a/doc/gettext_17.html +++ b/doc/gettext_17.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Program Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Program Index

    +

    Program Index

    Jump to: @@ -26,33 +26,33 @@ Jump to:

    a

    -
  • autopoint +
  • autopoint

    • g

    -
  • gettext, gettext -
  • gettextize +
  • gettext, gettext +
  • gettextize

    • m

    -
  • msgattrib -
  • msgcat -
  • msgcmp -
  • msgcomm -
  • msgconv -
  • msgen -
  • msgexec -
  • msgfilter -
  • msgfmt -
  • msggrep -
  • msginit -
  • msgmerge -
  • msgunfmt -
  • msguniq +
  • msgattrib +
  • msgcat +
  • msgcmp +
  • msgcomm +
  • msgconv +
  • msgen +
  • msgexec +
  • msgfilter +
  • msgfmt +
  • msggrep +
  • msginit +
  • msgmerge +
  • msgunfmt +
  • msguniq

    • n

    -
  • ngettext, ngettext +
  • ngettext, ngettext

    • x

    diff --git a/doc/gettext_18.html b/doc/gettext_18.html index a2371dd94..40b3ad285 100644 --- a/doc/gettext_18.html +++ b/doc/gettext_18.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Option Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Option Index

    +

    Option Index

    Jump to: @@ -18,434 +18,435 @@ Jump to:

    -

    -
  • --add-comments, xgettext option -
  • --add-location, msgattrib option -
  • --add-location, msgcat option -
  • --add-location, msgcomm option -
  • --add-location, msgconv option -
  • --add-location, msgen option -
  • --add-location, msgfilter option -
  • --add-location, msggrep option -
  • --add-location, msgmerge option -
  • --add-location, msguniq option -
  • --add-location, xgettext option -
  • --alignment, msgfmt option -
  • --backup, msgmerge option +
  • --add-comments, xgettext option +
  • --add-location, msgattrib option +
  • --add-location, msgcat option +
  • --add-location, msgcomm option +
  • --add-location, msgconv option +
  • --add-location, msgen option +
  • --add-location, msgfilter option +
  • --add-location, msggrep option +
  • --add-location, msgmerge option +
  • --add-location, msguniq option +
  • --add-location, xgettext option +
  • --alignment, msgfmt option +
  • --backup, msgmerge option
  • --c++, xgettext option -
  • --check, msgfmt option -
  • --check-accelerators, msgfmt option -
  • --check-compatibility, msgfmt option -
  • --check-domain, msgfmt option -
  • --check-format, msgfmt option -
  • --check-header, msgfmt option -
  • --clear-fuzzy, msgattrib option -
  • --clear-obsolete, msgattrib option -
  • --compendium, msgmerge option -
  • --copy, gettextize option -
  • --copyright-holder, xgettext option -
  • --debug, xgettext option +
  • --check, msgfmt option +
  • --check-accelerators, msgfmt option +
  • --check-compatibility, msgfmt option +
  • --check-domain, msgfmt option +
  • --check-format, msgfmt option +
  • --check-header, msgfmt option +
  • --clear-fuzzy, msgattrib option +
  • --clear-obsolete, msgattrib option +
  • --compendium, msgmerge option +
  • --copy, gettextize option +
  • --copyright-holder, xgettext option +
  • --debug, xgettext option
  • --default-domain, xgettext option -
  • --directory, msgattrib option -
  • --directory, msgcat option -
  • --directory, msgcmp option -
  • --directory, msgcomm option -
  • --directory, msgconv option -
  • --directory, msgen option -
  • --directory, msgexec option -
  • --directory, msgfilter option -
  • --directory, msgfmt option -
  • --directory, msggrep option -
  • --directory, msgmerge option -
  • --directory, msguniq option +
  • --directory, msgattrib option +
  • --directory, msgcat option +
  • --directory, msgcmp option +
  • --directory, msgcomm option +
  • --directory, msgconv option +
  • --directory, msgen option +
  • --directory, msgexec option +
  • --directory, msgfilter option +
  • --directory, msgfmt option +
  • --directory, msggrep option +
  • --directory, msgmerge option +
  • --directory, msguniq option
  • --directory, xgettext option -
  • --domain, msggrep option -
  • --dry-run, autopoint option -
  • --dry-run, gettextize option -
  • --exclude-file, xgettext option -
  • --expression, msgfilter option -
  • --extended-regexp, msggrep option -
  • --extract-all, xgettext option -
  • --file, msgfilter option -
  • --file, msggrep option -
  • --files-from, msgcat option -
  • --files-from, msgcomm option +
  • --domain, msggrep option +
  • --dry-run, autopoint option +
  • --dry-run, gettextize option +
  • --exclude-file, xgettext option +
  • --expression, msgfilter option +
  • --extended-regexp, msggrep option +
  • --extract-all, xgettext option +
  • --file, msgfilter option +
  • --file, msggrep option +
  • --files-from, msgcat option +
  • --files-from, msgcomm option
  • --files-from, xgettext option -
  • --fixed-strings, msggrep option -
  • --force, autopoint option -
  • --force, gettextize option -
  • --force-po, msgattrib option -
  • --force-po, msgcat option -
  • --force-po, msgcomm option -
  • --force-po, msgconv option -
  • --force-po, msgen option -
  • --force-po, msgfilter option -
  • --force-po, msggrep option -
  • --force-po, msgmerge option -
  • --force-po, msgunfmt option -
  • --force-po, msguniq option -
  • --force-po, xgettext option -
  • --foreign-user, xgettext option -
  • --fuzzy, msgattrib option -
  • --help, autopoint option -
  • --help, gettextize option -
  • --help, msgattrib option -
  • --help, msgcat option -
  • --help, msgcmp option -
  • --help, msgcomm option -
  • --help, msgconv option -
  • --help, msgen option -
  • --help, msgexec option -
  • --help, msgfilter option -
  • --help, msgfmt option -
  • --help, msggrep option -
  • --help, msginit option -
  • --help, msgmerge option -
  • --help, msgunfmt option -
  • --help, msguniq option -
  • --help, xgettext option -
  • --ignore-case, msggrep option -
  • --indent, msgattrib option -
  • --indent, msgcat option -
  • --indent, msgcomm option -
  • --indent, msgconv option -
  • --indent, msgen option -
  • --indent, msgfilter option -
  • --indent, msggrep option -
  • --indent, msgmerge option -
  • --indent, msgunfmt option -
  • --indent, msguniq option -
  • --indent, xgettext option -
  • --input, msgexec option -
  • --input, msgfilter option -
  • --input, msginit option -
  • --intl, gettextize option -
  • --java, msgfmt option -
  • --java, msgunfmt option -
  • --java2, msgfmt option -
  • --join-existing, xgettext option -
  • --keep-header, msgfilter option -
  • --keyword, xgettext option +
  • --fixed-strings, msggrep option +
  • --force, autopoint option +
  • --force, gettextize option +
  • --force-po, msgattrib option +
  • --force-po, msgcat option +
  • --force-po, msgcomm option +
  • --force-po, msgconv option +
  • --force-po, msgen option +
  • --force-po, msgfilter option +
  • --force-po, msggrep option +
  • --force-po, msgmerge option +
  • --force-po, msgunfmt option +
  • --force-po, msguniq option +
  • --force-po, xgettext option +
  • --foreign-user, xgettext option +
  • --from-code, xgettext option +
  • --fuzzy, msgattrib option +
  • --help, autopoint option +
  • --help, gettextize option +
  • --help, msgattrib option +
  • --help, msgcat option +
  • --help, msgcmp option +
  • --help, msgcomm option +
  • --help, msgconv option +
  • --help, msgen option +
  • --help, msgexec option +
  • --help, msgfilter option +
  • --help, msgfmt option +
  • --help, msggrep option +
  • --help, msginit option +
  • --help, msgmerge option +
  • --help, msgunfmt option +
  • --help, msguniq option +
  • --help, xgettext option +
  • --ignore-case, msggrep option +
  • --indent, msgattrib option +
  • --indent, msgcat option +
  • --indent, msgcomm option +
  • --indent, msgconv option +
  • --indent, msgen option +
  • --indent, msgfilter option +
  • --indent, msggrep option +
  • --indent, msgmerge option +
  • --indent, msgunfmt option +
  • --indent, msguniq option +
  • --indent, xgettext option +
  • --input, msgexec option +
  • --input, msgfilter option +
  • --input, msginit option +
  • --intl, gettextize option +
  • --java, msgfmt option +
  • --java, msgunfmt option +
  • --java2, msgfmt option +
  • --join-existing, xgettext option +
  • --keep-header, msgfilter option +
  • --keyword, xgettext option
  • --language, xgettext option -
  • --less-than, msgcat option -
  • --less-than, msgcomm option -
  • --locale, msgfmt option, --locale, msgfmt option -
  • --locale, msginit option -
  • --locale, msgunfmt option, --locale, msgunfmt option -
  • --location, msggrep option -
  • --more-than, msgcat option -
  • --more-than, msgcomm option -
  • --msgid, msggrep option -
  • --msgstr, msggrep option -
  • --msgstr-prefix, xgettext option -
  • --msgstr-suffix, xgettext option -
  • --multi-domain, msgcmp option -
  • --multi-domain, msgmerge option -
  • --no-changelog, gettextize option -
  • --no-fuzzy, msgattrib option -
  • --no-hash, msgfmt option -
  • --no-location, msgattrib option -
  • --no-location, msgcat option -
  • --no-location, msgcomm option -
  • --no-location, msgconv option -
  • --no-location, msgen option -
  • --no-location, msgfilter option -
  • --no-location, msggrep option -
  • --no-location, msgmerge option -
  • --no-location, msguniq option -
  • --no-location, xgettext option -
  • --no-obsolete, msgattrib option -
  • --no-translator, msginit option -
  • --no-wrap, msgattrib option -
  • --no-wrap, msgcat option -
  • --no-wrap, msgcomm option -
  • --no-wrap, msgconv option -
  • --no-wrap, msgen option -
  • --no-wrap, msgfilter option -
  • --no-wrap, msggrep option -
  • --no-wrap, msginit option -
  • --no-wrap, msgmerge option -
  • --no-wrap, msgunfmt option -
  • --no-wrap, msguniq option -
  • --no-wrap, xgettext option -
  • --obsolete, msgattrib option -
  • --omit-header, msgcomm option -
  • --omit-header, xgettext option -
  • --only-fuzzy, msgattrib option -
  • --only-obsolete, msgattrib option +
  • --less-than, msgcat option +
  • --less-than, msgcomm option +
  • --locale, msgfmt option, --locale, msgfmt option +
  • --locale, msginit option +
  • --locale, msgunfmt option, --locale, msgunfmt option +
  • --location, msggrep option +
  • --more-than, msgcat option +
  • --more-than, msgcomm option +
  • --msgid, msggrep option +
  • --msgstr, msggrep option +
  • --msgstr-prefix, xgettext option +
  • --msgstr-suffix, xgettext option +
  • --multi-domain, msgcmp option +
  • --multi-domain, msgmerge option +
  • --no-changelog, gettextize option +
  • --no-fuzzy, msgattrib option +
  • --no-hash, msgfmt option +
  • --no-location, msgattrib option +
  • --no-location, msgcat option +
  • --no-location, msgcomm option +
  • --no-location, msgconv option +
  • --no-location, msgen option +
  • --no-location, msgfilter option +
  • --no-location, msggrep option +
  • --no-location, msgmerge option +
  • --no-location, msguniq option +
  • --no-location, xgettext option +
  • --no-obsolete, msgattrib option +
  • --no-translator, msginit option +
  • --no-wrap, msgattrib option +
  • --no-wrap, msgcat option +
  • --no-wrap, msgcomm option +
  • --no-wrap, msgconv option +
  • --no-wrap, msgen option +
  • --no-wrap, msgfilter option +
  • --no-wrap, msggrep option +
  • --no-wrap, msginit option +
  • --no-wrap, msgmerge option +
  • --no-wrap, msgunfmt option +
  • --no-wrap, msguniq option +
  • --no-wrap, xgettext option +
  • --obsolete, msgattrib option +
  • --omit-header, msgcomm option +
  • --omit-header, xgettext option +
  • --only-fuzzy, msgattrib option +
  • --only-obsolete, msgattrib option
  • --output, xgettext option
  • --output-dir, xgettext option -
  • --output-file, msgattrib option -
  • --output-file, msgcat option -
  • --output-file, msgcomm option -
  • --output-file, msgconv option -
  • --output-file, msgen option -
  • --output-file, msgfilter option -
  • --output-file, msgfmt option -
  • --output-file, msggrep option -
  • --output-file, msginit option -
  • --output-file, msgmerge option -
  • --output-file, msgunfmt option -
  • --output-file, msguniq option -
  • --quiet, msgfilter option -
  • --quiet, msgmerge option -
  • --regexp=, msggrep option -
  • --repeated, msguniq option -
  • --resource, msgfmt option -
  • --resource, msgunfmt option -
  • --set-fuzzy, msgattrib option -
  • --set-obsolete, msgattrib option -
  • --silent, msgfilter option -
  • --silent, msgmerge option -
  • --sort-by-file, msgattrib option -
  • --sort-by-file, msgcat option -
  • --sort-by-file, msgcomm option -
  • --sort-by-file, msgconv option -
  • --sort-by-file, msgen option -
  • --sort-by-file, msgfilter option -
  • --sort-by-file, msggrep option -
  • --sort-by-file, msgmerge option -
  • --sort-by-file, msguniq option -
  • --sort-by-file, xgettext option -
  • --sort-output, msgattrib option -
  • --sort-output, msgcat option -
  • --sort-output, msgcomm option -
  • --sort-output, msgconv option -
  • --sort-output, msgen option -
  • --sort-output, msgfilter option -
  • --sort-output, msggrep option -
  • --sort-output, msgmerge option -
  • --sort-output, msgunfmt option -
  • --sort-output, msguniq option -
  • --sort-output, xgettext option -
  • --statistics, msgfmt option -
  • --strict, msgattrib option -
  • --strict, msgcat option -
  • --strict, msgcomm option -
  • --strict, msgconv option -
  • --strict, msgen option -
  • --strict, msgfilter option -
  • --strict, msgfmt option -
  • --strict, msggrep option -
  • --strict, msgmerge option -
  • --strict, msgunfmt option -
  • --strict, msguniq option -
  • --strict, xgettext option -
  • --suffix, msgmerge option -
  • --tcl, msgfmt option -
  • --tcl, msgunfmt option -
  • --to-code, msgcat option -
  • --to-code, msgconv option -
  • --to-code, msguniq option -
  • --translated, msgattrib option -
  • --trigraphs, xgettext option -
  • --unique, msgcat option -
  • --unique, msgcomm option -
  • --unique, msguniq option -
  • --untranslated, msgattrib option -
  • --update, msgmerge option -
  • --use-first, msgcat option -
  • --use-first, msguniq option -
  • --use-fuzzy, msgfmt option -
  • --verbose, msgfmt option -
  • --verbose, msgmerge option -
  • --verbose, msgunfmt option -
  • --version, autopoint option -
  • --version, gettextize option -
  • --version, msgattrib option -
  • --version, msgcat option -
  • --version, msgcmp option -
  • --version, msgcomm option -
  • --version, msgconv option -
  • --version, msgen option -
  • --version, msgexec option -
  • --version, msgfilter option -
  • --version, msgfmt option -
  • --version, msggrep option -
  • --version, msginit option -
  • --version, msgmerge option -
  • --version, msgunfmt option -
  • --version, msguniq option -
  • --version, xgettext option -
  • --width, msgattrib option -
  • --width, msgcat option -
  • --width, msgcomm option -
  • --width, msgconv option -
  • --width, msgen option -
  • --width, msgfilter option -
  • --width, msggrep option -
  • --width, msginit option -
  • --width, msgmerge option -
  • --width, msgunfmt option -
  • --width, msguniq option -
  • --width, xgettext option -
  • -<, msgcat option -
  • -<, msgcomm option -
  • ->, msgcat option -
  • ->, msgcomm option -
  • -a, msgfmt option -
  • -a, xgettext option -
  • -c, gettextize option -
  • -C, msgfmt option -
  • -c, msgfmt option -
  • -C, msgmerge option -
  • -c, xgettext option +
  • --output-file, msgattrib option +
  • --output-file, msgcat option +
  • --output-file, msgcomm option +
  • --output-file, msgconv option +
  • --output-file, msgen option +
  • --output-file, msgfilter option +
  • --output-file, msgfmt option +
  • --output-file, msggrep option +
  • --output-file, msginit option +
  • --output-file, msgmerge option +
  • --output-file, msgunfmt option +
  • --output-file, msguniq option +
  • --quiet, msgfilter option +
  • --quiet, msgmerge option +
  • --regexp=, msggrep option +
  • --repeated, msguniq option +
  • --resource, msgfmt option +
  • --resource, msgunfmt option +
  • --set-fuzzy, msgattrib option +
  • --set-obsolete, msgattrib option +
  • --silent, msgfilter option +
  • --silent, msgmerge option +
  • --sort-by-file, msgattrib option +
  • --sort-by-file, msgcat option +
  • --sort-by-file, msgcomm option +
  • --sort-by-file, msgconv option +
  • --sort-by-file, msgen option +
  • --sort-by-file, msgfilter option +
  • --sort-by-file, msggrep option +
  • --sort-by-file, msgmerge option +
  • --sort-by-file, msguniq option +
  • --sort-by-file, xgettext option +
  • --sort-output, msgattrib option +
  • --sort-output, msgcat option +
  • --sort-output, msgcomm option +
  • --sort-output, msgconv option +
  • --sort-output, msgen option +
  • --sort-output, msgfilter option +
  • --sort-output, msggrep option +
  • --sort-output, msgmerge option +
  • --sort-output, msgunfmt option +
  • --sort-output, msguniq option +
  • --sort-output, xgettext option +
  • --statistics, msgfmt option +
  • --strict, msgattrib option +
  • --strict, msgcat option +
  • --strict, msgcomm option +
  • --strict, msgconv option +
  • --strict, msgen option +
  • --strict, msgfilter option +
  • --strict, msgfmt option +
  • --strict, msggrep option +
  • --strict, msgmerge option +
  • --strict, msgunfmt option +
  • --strict, msguniq option +
  • --strict, xgettext option +
  • --suffix, msgmerge option +
  • --tcl, msgfmt option +
  • --tcl, msgunfmt option +
  • --to-code, msgcat option +
  • --to-code, msgconv option +
  • --to-code, msguniq option +
  • --translated, msgattrib option +
  • --trigraphs, xgettext option +
  • --unique, msgcat option +
  • --unique, msgcomm option +
  • --unique, msguniq option +
  • --untranslated, msgattrib option +
  • --update, msgmerge option +
  • --use-first, msgcat option +
  • --use-first, msguniq option +
  • --use-fuzzy, msgfmt option +
  • --verbose, msgfmt option +
  • --verbose, msgmerge option +
  • --verbose, msgunfmt option +
  • --version, autopoint option +
  • --version, gettextize option +
  • --version, msgattrib option +
  • --version, msgcat option +
  • --version, msgcmp option +
  • --version, msgcomm option +
  • --version, msgconv option +
  • --version, msgen option +
  • --version, msgexec option +
  • --version, msgfilter option +
  • --version, msgfmt option +
  • --version, msggrep option +
  • --version, msginit option +
  • --version, msgmerge option +
  • --version, msgunfmt option +
  • --version, msguniq option +
  • --version, xgettext option +
  • --width, msgattrib option +
  • --width, msgcat option +
  • --width, msgcomm option +
  • --width, msgconv option +
  • --width, msgen option +
  • --width, msgfilter option +
  • --width, msggrep option +
  • --width, msginit option +
  • --width, msgmerge option +
  • --width, msgunfmt option +
  • --width, msguniq option +
  • --width, xgettext option +
  • -<, msgcat option +
  • -<, msgcomm option +
  • ->, msgcat option +
  • ->, msgcomm option +
  • -a, msgfmt option +
  • -a, xgettext option +
  • -c, gettextize option +
  • -C, msgfmt option +
  • -c, msgfmt option +
  • -C, msgmerge option
  • -C, xgettext option -
  • -d, autopoint option -
  • -d, gettextize option -
  • -D, msgattrib option -
  • -D, msgcat option -
  • -D, msgcmp option -
  • -D, msgcomm option -
  • -D, msgconv option -
  • -D, msgen option -
  • -D, msgexec option -
  • -D, msgfilter option -
  • -D, msgfmt option -
  • -d, msgfmt option, -d, msgfmt option -
  • -D, msggrep option -
  • -D, msgmerge option -
  • -d, msgunfmt option -
  • -d, msguniq option -
  • -D, msguniq option -
  • -D, xgettext option +
  • -c, xgettext option +
  • -d, autopoint option +
  • -d, gettextize option +
  • -D, msgattrib option +
  • -D, msgcat option +
  • -D, msgcmp option +
  • -D, msgcomm option +
  • -D, msgconv option +
  • -D, msgen option +
  • -D, msgexec option +
  • -D, msgfilter option +
  • -D, msgfmt option +
  • -d, msgfmt option, -d, msgfmt option +
  • -D, msggrep option +
  • -D, msgmerge option +
  • -d, msgunfmt option +
  • -d, msguniq option +
  • -D, msguniq option
  • -d, xgettext option -
  • -e, msgfilter option -
  • -e, msggrep option -
  • -E, msggrep option -
  • -f, autopoint option -
  • -f, gettextize option -
  • -F, msgattrib option -
  • -F, msgcat option -
  • -f, msgcat option -
  • -F, msgcomm option -
  • -f, msgcomm option -
  • -F, msgconv option -
  • -F, msgen option -
  • -f, msgfilter option -
  • -F, msgfilter option -
  • -f, msgfmt option -
  • -F, msggrep option -
  • -f, msggrep option -
  • -F, msgmerge option -
  • -F, msguniq option -
  • -F, xgettext option +
  • -D, xgettext option +
  • -e, msgfilter option +
  • -e, msggrep option +
  • -E, msggrep option +
  • -f, autopoint option +
  • -f, gettextize option +
  • -F, msgattrib option +
  • -F, msgcat option +
  • -f, msgcat option +
  • -f, msgcomm option +
  • -F, msgcomm option +
  • -F, msgconv option +
  • -F, msgen option +
  • -f, msgfilter option +
  • -F, msgfilter option +
  • -f, msgfmt option +
  • -F, msggrep option +
  • -f, msggrep option +
  • -F, msgmerge option +
  • -F, msguniq option +
  • -F, xgettext option
  • -f, xgettext option -
  • -h, msgattrib option -
  • -h, msgcat option -
  • -h, msgcmp option -
  • -h, msgcomm option -
  • -h, msgconv option -
  • -h, msgen option -
  • -h, msgexec option -
  • -h, msgfilter option -
  • -h, msgfmt option -
  • -h, msggrep option -
  • -h, msginit option -
  • -h, msgmerge option -
  • -h, msgunfmt option -
  • -h, msguniq option -
  • -h, xgettext option -
  • -i, msgattrib option -
  • -i, msgcat option -
  • -i, msgcomm option -
  • -i, msgconv option -
  • -i, msgen option -
  • -i, msgexec option -
  • -i, msgfilter option -
  • -i, msggrep option -
  • -i, msginit option -
  • -i, msgmerge option -
  • -i, msgunfmt option -
  • -i, msguniq option -
  • -i, xgettext option -
  • -j, msgfmt option -
  • -j, msgunfmt option -
  • -j, xgettext option -
  • -K, msggrep option -
  • -k, xgettext option -
  • -l, msgfmt option, -l, msgfmt option -
  • -l, msginit option -
  • -l, msgunfmt option, -l, msgunfmt option +
  • -h, msgattrib option +
  • -h, msgcat option +
  • -h, msgcmp option +
  • -h, msgcomm option +
  • -h, msgconv option +
  • -h, msgen option +
  • -h, msgexec option +
  • -h, msgfilter option +
  • -h, msgfmt option +
  • -h, msggrep option +
  • -h, msginit option +
  • -h, msgmerge option +
  • -h, msgunfmt option +
  • -h, msguniq option +
  • -h, xgettext option +
  • -i, msgattrib option +
  • -i, msgcat option +
  • -i, msgcomm option +
  • -i, msgconv option +
  • -i, msgen option +
  • -i, msgexec option +
  • -i, msgfilter option +
  • -i, msggrep option +
  • -i, msginit option +
  • -i, msgmerge option +
  • -i, msgunfmt option +
  • -i, msguniq option +
  • -i, xgettext option +
  • -j, msgfmt option +
  • -j, msgunfmt option +
  • -j, xgettext option +
  • -K, msggrep option +
  • -k, xgettext option +
  • -l, msgfmt option, -l, msgfmt option +
  • -l, msginit option +
  • -l, msgunfmt option, -l, msgunfmt option
  • -L, xgettext option -
  • -m, msgcmp option -
  • -M, msggrep option -
  • -m, msgmerge option -
  • -m, xgettext option -
  • -M, xgettext option -
  • -n, msgattrib option -
  • -n, msgcat option -
  • -n, msgcomm option -
  • -n, msgfilter option -
  • -N, msggrep option -
  • -n, msguniq option -
  • -n, xgettext option -
  • -o, msgattrib option -
  • -o, msgcat option -
  • -o, msgcomm option -
  • -o, msgconv option -
  • -o, msgen option -
  • -o, msgfilter option -
  • -o, msgfmt option -
  • -o, msggrep option -
  • -o, msginit option -
  • -o, msgmerge option -
  • -o, msgunfmt option -
  • -o, msguniq option +
  • -m, msgcmp option +
  • -M, msggrep option +
  • -m, msgmerge option +
  • -M, xgettext option +
  • -m, xgettext option +
  • -n, msgattrib option +
  • -n, msgcat option +
  • -n, msgcomm option +
  • -n, msgfilter option +
  • -N, msggrep option +
  • -n, msguniq option +
  • -n, xgettext option +
  • -o, msgattrib option +
  • -o, msgcat option +
  • -o, msgcomm option +
  • -o, msgconv option +
  • -o, msgen option +
  • -o, msgfilter option +
  • -o, msgfmt option +
  • -o, msggrep option +
  • -o, msginit option +
  • -o, msgmerge option +
  • -o, msgunfmt option +
  • -o, msguniq option
  • -o, xgettext option
  • -p, xgettext option -
  • -q, msgmerge option -
  • -r, msgfmt option -
  • -r, msgunfmt option -
  • -s, msgattrib option -
  • -s, msgcat option -
  • -s, msgcomm option -
  • -s, msgconv option -
  • -s, msgen option -
  • -s, msgfilter option -
  • -s, msgmerge option -
  • -s, msgunfmt option -
  • -s, msguniq option -
  • -s, xgettext option -
  • -t, msgcat option -
  • -t, msgconv option -
  • -T, msggrep option -
  • -t, msguniq option -
  • -T, xgettext option -
  • -u, msgcat option -
  • -u, msgcomm option -
  • -U, msgmerge option -
  • -u, msguniq option -
  • -V, msgattrib option -
  • -V, msgcat option -
  • -V, msgcmp option -
  • -V, msgcomm option -
  • -V, msgconv option -
  • -V, msgen option -
  • -V, msgexec option -
  • -V, msgfilter option -
  • -V, msgfmt option -
  • -v, msgfmt option -
  • -V, msggrep option -
  • -V, msginit option -
  • -v, msgmerge option -
  • -V, msgmerge option -
  • -V, msgunfmt option -
  • -v, msgunfmt option -
  • -V, msguniq option -
  • -V, xgettext option -
  • -w, msgattrib option -
  • -w, msgcat option -
  • -w, msgcomm option -
  • -w, msgconv option -
  • -w, msgen option -
  • -w, msgfilter option -
  • -w, msggrep option -
  • -w, msginit option -
  • -w, msgmerge option -
  • -w, msgunfmt option -
  • -w, msguniq option -
  • -w, xgettext option -
  • -x, xgettext option +
  • -q, msgmerge option +
  • -r, msgfmt option +
  • -r, msgunfmt option +
  • -s, msgattrib option +
  • -s, msgcat option +
  • -s, msgcomm option +
  • -s, msgconv option +
  • -s, msgen option +
  • -s, msgfilter option +
  • -s, msgmerge option +
  • -s, msgunfmt option +
  • -s, msguniq option +
  • -s, xgettext option +
  • -t, msgcat option +
  • -t, msgconv option +
  • -T, msggrep option +
  • -t, msguniq option +
  • -T, xgettext option +
  • -u, msgcat option +
  • -u, msgcomm option +
  • -U, msgmerge option +
  • -u, msguniq option +
  • -V, msgattrib option +
  • -V, msgcat option +
  • -V, msgcmp option +
  • -V, msgcomm option +
  • -V, msgconv option +
  • -V, msgen option +
  • -V, msgexec option +
  • -V, msgfilter option +
  • -v, msgfmt option +
  • -V, msgfmt option +
  • -V, msggrep option +
  • -V, msginit option +
  • -V, msgmerge option +
  • -v, msgmerge option +
  • -v, msgunfmt option +
  • -V, msgunfmt option +
  • -V, msguniq option +
  • -V, xgettext option +
  • -w, msgattrib option +
  • -w, msgcat option +
  • -w, msgcomm option +
  • -w, msgconv option +
  • -w, msgen option +
  • -w, msgfilter option +
  • -w, msggrep option +
  • -w, msginit option +
  • -w, msgmerge option +
  • -w, msgunfmt option +
  • -w, msguniq option +
  • -w, xgettext option +
  • -x, xgettext option

    • diff --git a/doc/gettext_19.html b/doc/gettext_19.html index ebdaa8d60..1981ad2e3 100644 --- a/doc/gettext_19.html +++ b/doc/gettext_19.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Variable Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Variable Index

    +

    Variable Index

    Jump to: @@ -22,26 +22,26 @@ Jump to:

    l

    -
  • LANG, environment variable, LANG, environment variable -
  • LANGUAGE, environment variable, LANGUAGE, environment variable -
  • LC_ALL, environment variable -
  • LC_COLLATE, environment variable -
  • LC_CTYPE, environment variable -
  • LC_MESSAGES, environment variable -
  • LC_MONETARY, environment variable -
  • LC_NUMERIC, environment variable -
  • LC_TIME, environment variable -
  • LINGUAS, environment variable +
  • LANG, environment variable, LANG, environment variable +
  • LANGUAGE, environment variable, LANGUAGE, environment variable +
  • LC_ALL, environment variable +
  • LC_COLLATE, environment variable +
  • LC_CTYPE, environment variable +
  • LC_MESSAGES, environment variable +
  • LC_MONETARY, environment variable +
  • LC_NUMERIC, environment variable +
  • LC_TIME, environment variable +
  • LINGUAS, environment variable

    • m

    -
  • MSGEXEC_LOCATION, environment variable -
  • MSGEXEC_MSGID, environment variable +
  • MSGEXEC_LOCATION, environment variable +
  • MSGEXEC_MSGID, environment variable

    • t

    -
  • TEXTDOMAIN, environment variable, TEXTDOMAIN, environment variable -
  • TEXTDOMAINDIR, environment variable, TEXTDOMAINDIR, environment variable +
  • TEXTDOMAIN, environment variable, TEXTDOMAIN, environment variable +
  • TEXTDOMAINDIR, environment variable, TEXTDOMAINDIR, environment variable

    • diff --git a/doc/gettext_2.html b/doc/gettext_2.html index 00f148cfd..bb19ddf67 100644 --- a/doc/gettext_2.html +++ b/doc/gettext_2.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 2 PO Files and PO Mode Basics @@ -185,7 +185,7 @@ can judge if the translation requires further modification, or is acceptable as is. Once satisfied with the translation, she then removes this fuzzy attribute. The msgmerge program inserts this when it combined the msgid and msgstr entries after fuzzy -search only. See section 6.3 Fuzzy Entries. +search only. See section 6.3 Fuzzy Entries.
    c-format
    @@ -200,7 +200,7 @@ soon as the xgettext program generates a new template file. In case the c-format flag is given for a string the msgfmt does some more tests to check to validity of the translation. -See section 8.1 Invoking the msgfmt Program. +See section 8.1 Invoking the msgfmt Program.
    @@ -329,9 +329,9 @@ When PO mode is active in a window, the letters `PO´ appear in the mode line for that window. The mode line also displays how many entries of each kind are held in the PO file. For example, the string `132t+3f+10u+2o´ would tell the translator that the -PO mode contains 132 translated entries (see section 6.2 Translated Entries, -3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries -(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 Obsolete Entries). Zero-coefficients items are not shown. So, in this example, if +PO mode contains 132 translated entries (see section 6.2 Translated Entries, +3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries +(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 Obsolete Entries). Zero-coefficients items are not shown. So, in this example, if the fuzzy entries were unfuzzied, the untranslated entries were translated and the obsolete entries were deleted, the mode line would merely display `145t´ for the counters. diff --git a/doc/gettext_20.html b/doc/gettext_20.html index 8fae7b7ba..7531c2a3f 100644 --- a/doc/gettext_20.html +++ b/doc/gettext_20.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - PO Mode Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    PO Mode Index

    +

    PO Mode Index

    Jump to: @@ -46,28 +46,28 @@ Jump to:

    a

    -
  • auxiliary PO file +
  • auxiliary PO file

    • c

  • commands -
  • comment out PO file entry -
  • consulting program sources -
  • consulting translations to other languages +
  • comment out PO file entry +
  • consulting program sources +
  • consulting translations to other languages
  • current entry of a PO file -
  • cut and paste for translated strings +
  • cut and paste for translated strings

    • e

    -
  • editing comments -
  • editing multiple entries -
  • editing translations +
  • editing comments +
  • editing multiple entries +
  • editing translations
  • etags, using for marking strings -
  • exiting PO subedit +
  • exiting PO subedit

    • f

    -
  • find source fragment for a PO file entry +
  • find source fragment for a PO file entry

    • i

    @@ -75,30 +75,30 @@ Jump to:

    l

    -
  • looking at the source to aid translation +
  • looking at the source to aid translation

    • m

  • marking strings for translation -
  • moving by fuzzy entries -
  • moving by obsolete entries -
  • moving by translated entries -
  • moving by untranslated entries +
  • moving by fuzzy entries +
  • moving by obsolete entries +
  • moving by translated entries +
  • moving by untranslated entries
  • moving through a PO file

    • o

    -
  • obsolete active entry +
  • obsolete active entry

    • p

    -
  • pending subedits +
  • pending subedits

    • s

    -
  • starting a string translation +
  • starting a string translation
  • string normalization in entries -
  • subedit minor mode +
  • subedit minor mode

    • t

    @@ -106,9 +106,9 @@ Jump to:

    u

    -
  • use the source, Luke -
  • using obsolete translations to make new entries -
  • using translation compendia +
  • use the source, Luke +
  • using obsolete translations to make new entries +
  • using translation compendia

    • diff --git a/doc/gettext_21.html b/doc/gettext_21.html index 003c7bb18..5595e6b83 100644 --- a/doc/gettext_21.html +++ b/doc/gettext_21.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Autoconf Macro Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Autoconf Macro Index

    +

    Autoconf Macro Index

    Jump to: @@ -18,9 +18,9 @@ Jump to:

    a

    -
  • AM_GNU_GETTEXT -
  • AM_GNU_GETTEXT_VERSION -
  • AM_ICONV +
  • AM_GNU_GETTEXT +
  • AM_GNU_GETTEXT_VERSION +
  • AM_ICONV

    • diff --git a/doc/gettext_22.html b/doc/gettext_22.html index 668b5a476..440947f60 100644 --- a/doc/gettext_22.html +++ b/doc/gettext_22.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - General Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    General Index

    +

    General Index

    Jump to: @@ -69,177 +69,177 @@ Jump to:

    _

  • _, a macro to mark strings for translation -
  • _nl_msg_cat_cntr +
  • _nl_msg_cat_cntr

    • a

    -
  • `ABOUT-NLS´ file -
  • `acconfig.h´ file -
  • accumulating translations -
  • `aclocal.m4´ file -
  • adding keywords, xgettext +
  • `ABOUT-NLS´ file +
  • `acconfig.h´ file +
  • accumulating translations +
  • `aclocal.m4´ file +
  • adding keywords, xgettext
  • ambiguities -
  • apply a filter to translations -
  • apply command to all translations in a catalog -
  • attribute manipulation -
  • attribute, fuzzy -
  • attributes of a PO file entry -
  • attributes, manipulating -
  • autoconf macros for gettext -
  • autopoint program, usage -
  • auxiliary PO file -
  • available translations -
  • awk +
  • apply a filter to translations +
  • apply command to all translations in a catalog +
  • attribute manipulation +
  • attribute, fuzzy +
  • attributes of a PO file entry +
  • attributes, manipulating +
  • autoconf macros for gettext +
  • autopoint program, usage +
  • auxiliary PO file +
  • available translations +
  • awk

    • b

    -
  • backup old file, and msgmerge program -
  • bash -
  • bibliography +
  • backup old file, and msgmerge program +
  • bash +
  • bibliography
  • big picture -
  • bind_textdomain_codeset +
  • bind_textdomain_codeset
  • bug report address

    • c

    -
  • C and C-like languages -
  • C trigraphs -
  • catalog encoding and msgexec output -
  • catclose, a catgets function -
  • catgets, X/Open specification -
  • catgets, a catgets function -
  • catopen, a catgets function +
  • C and C-like languages +
  • C trigraphs +
  • catalog encoding and msgexec output +
  • catclose, a catgets function +
  • catgets, X/Open specification +
  • catgets, a catgets function +
  • catopen, a catgets function
  • character encoding -
  • charset conversion at runtime -
  • charset of PO files -
  • check format strings -
  • checking of translations -
  • clisp -
  • clisp C sources +
  • charset conversion at runtime +
  • charset of PO files +
  • check format strings +
  • checking of translations +
  • clisp +
  • clisp C sources
  • codeset
  • comments in PO files -
  • Common Lisp -
  • compare PO files -
  • comparison of interfaces -
  • compatibility with X/Open msgfmt -
  • compendium -
  • compendium, creating -
  • concatenate PO files -
  • concatenating PO files into a compendium +
  • Common Lisp +
  • compare PO files +
  • comparison of interfaces +
  • compatibility with X/Open msgfmt +
  • compendium +
  • compendium, creating +
  • concatenate PO files +
  • concatenating PO files into a compendium
  • concatenation of strings -
  • `config.h.in´ file -
  • convert binary message catalog into PO file -
  • convert translations to a different encoding -
  • converting a package to use gettext -
  • country codes -
  • create new PO file -
  • creating a new PO file -
  • creating compendia +
  • `config.h.in´ file +
  • convert binary message catalog into PO file +
  • convert translations to a different encoding +
  • converting a package to use gettext +
  • country codes +
  • create new PO file +
  • creating a new PO file +
  • creating compendia
  • currency symbols

    • d

  • date format -
  • dcngettext -
  • debugging messages marked as format strings -
  • dialect -
  • disabling NLS -
  • dngettext -
  • domain ambiguities -
  • duplicate elimination -
  • duplicate removal +
  • dcngettext +
  • debugging messages marked as format strings +
  • dialect +
  • disabling NLS +
  • dngettext +
  • domain ambiguities +
  • duplicate elimination +
  • duplicate removal

    • e

    -
  • editing comments in PO files -
  • editing translations -
  • Emacs Lisp +
  • editing comments in PO files +
  • editing translations +
  • Emacs Lisp
  • encoding -
  • encoding conversion -
  • encoding conversion at runtime -
  • encoding for your language -
  • encoding list -
  • encoding of PO files +
  • encoding conversion +
  • encoding conversion at runtime +
  • encoding for your language +
  • encoding list +
  • encoding of PO files
  • evolution of packages -
  • extracting parts of a PO file into a compendium +
  • extracting parts of a PO file into a compendium

    • f

    -
  • file format, `.mo´ +
  • file format, `.mo´
  • file format, `.po´
  • files, `.po´ and `.mo´
  • files, `.pot´ -
  • filter messages according to attributes -
  • find common messages -
  • force use of fuzzy entries +
  • filter messages according to attributes +
  • find common messages +
  • force use of fuzzy entries
  • format strings -
  • Free Pascal -
  • fuzzy entries +
  • Free Pascal +
  • fuzzy entries

    • g

    -
  • gawk -
  • generate binary message catalog from PO file -
  • generate translation catalog in English -
  • gettext files +
  • gawk +
  • generate binary message catalog from PO file +
  • generate translation catalog in English +
  • gettext files
  • gettext installation -
  • gettext interface -
  • gettext, a programmer's view -
  • `gettext.h´ file -
  • gettext vs catgets -
  • gettextize program, usage -
  • GUI programs +
  • gettext interface +
  • gettext, a programmer's view +
  • `gettext.h´ file +
  • gettext vs catgets +
  • gettextize program, usage +
  • GUI programs

    • h

    -
  • hash table, inside MO files +
  • hash table, inside MO files
  • he, she, and they -
  • header entry of a PO file +
  • header entry of a PO file
  • help option -
  • history of GNU gettext +
  • history of GNU gettext

    • i

  • i18n
  • importing PO files -
  • include file `libintl.h´, include file `libintl.h´, include file `libintl.h´, include file `libintl.h´ +
  • include file `libintl.h´, include file `libintl.h´, include file `libintl.h´, include file `libintl.h´
  • initialization -
  • initialize new PO file -
  • initialize translations from a compendium +
  • initialize new PO file +
  • initialize translations from a compendium
  • installing gettext -
  • interface to catgets +
  • interface to catgets
  • internationalization
  • inttypes.h -
  • ISO 3166 -
  • ISO 639 +
  • ISO 3166 +
  • ISO 639

    • j

    -
  • Java -
  • Java mode, and msgfmt program -
  • Java mode, and msgunfmt program +
  • Java +
  • Java mode, and msgfmt program +
  • Java mode, and msgunfmt program
  • Java, string concatenation

    • k

    -
  • keyboard accelerator checking +
  • keyboard accelerator checking

    • l

  • l10n -
  • language codes -
  • language selection -
  • language selection at runtime -
  • large package -
  • libiconv library -
  • libintl for Java -
  • libintl library -
  • librep Lisp -
  • `LINGUAS´ file +
  • language codes +
  • language selection +
  • language selection at runtime +
  • large package +
  • libiconv library +
  • libintl for Java +
  • libintl library +
  • librep Lisp +
  • `LINGUAS´ file
  • link with `libintl´ -
  • Linux, Linux, Linux -
  • Lisp -
  • list of translation teams, where to find +
  • Linux, Linux, Linux +
  • Lisp +
  • list of translation teams, where to find
  • locale facet, LC_ALL
  • locale facet, LC_COLLATE
  • locale facet, LC_CTYPE, locale facet, LC_CTYPE, locale facet, LC_CTYPE @@ -249,120 +249,120 @@ Jump to:
  • locale facet, LC_RESPONSES
  • locale facet, LC_TIME, locale facet, LC_TIME
  • locale facets -
  • locale program +
  • locale program
  • localization

    • m

    -
  • magic signature of MO files -
  • `Makevars´ file -
  • manipulating PO files +
  • magic signature of MO files +
  • `Makevars´ file +
  • manipulating PO files
  • marking string initializers
  • marking strings that require translation
  • marking strings, preparations
  • marking translatable strings -
  • menu entries -
  • menu, keyboard accelerator support -
  • merge PO files -
  • merging two PO files -
  • message catalog files location +
  • menu entries +
  • menu, keyboard accelerator support +
  • merge PO files +
  • merging two PO files +
  • message catalog files location
  • messages -
  • migration from earlier versions of gettext -
  • `mkinstalldirs´ file -
  • mnemonics of menu entries -
  • MO file's format -
  • modify message attrributes -
  • msgattrib program, usage -
  • msgcat program, usage -
  • msgcmp program, usage -
  • msgcomm program, usage -
  • msgconv program, usage -
  • msgen program, usage -
  • msgexec program, usage -
  • msgfilter filter and catalog encoding -
  • msgfilter program, usage -
  • msgfmt program, usage -
  • msggrep program, usage -
  • msginit program, usage -
  • msgmerge program, usage -
  • msgunfmt program, usage -
  • msguniq program, usage +
  • migration from earlier versions of gettext +
  • `mkinstalldirs´ file +
  • mnemonics of menu entries +
  • MO file's format +
  • modify message attrributes +
  • msgattrib program, usage +
  • msgcat program, usage +
  • msgcmp program, usage +
  • msgcomm program, usage +
  • msgconv program, usage +
  • msgen program, usage +
  • msgexec program, usage +
  • msgfilter filter and catalog encoding +
  • msgfilter program, usage +
  • msgfmt program, usage +
  • msggrep program, usage +
  • msginit program, usage +
  • msgmerge program, usage +
  • msgunfmt program, usage +
  • msguniq program, usage
  • multi-line strings

    • n

    -
  • N_, a convenience macro +
  • N_, a convenience macro
  • Native Language Support
  • Natural Language Support
  • newlines in PO files -
  • ngettext +
  • ngettext
  • NLS
  • number format

    • o

    -
  • Object Pascal -
  • obsolete entries -
  • optimization of gettext functions -
  • orthography +
  • Object Pascal +
  • obsolete entries +
  • optimization of gettext functions +
  • orthography
  • output to stdout, xgettext
  • overview of gettext

    • p

    -
  • package and version declaration in `configure.in´ -
  • package build and installation options -
  • package maintainer's view of gettext +
  • package and version declaration in `configure.in´ +
  • package build and installation options +
  • package maintainer's view of gettext
  • paragraphs -
  • Pascal -
  • Perl -
  • PHP -
  • Pike -
  • plural form formulas -
  • plural forms -
  • plural forms, in MO files +
  • Pascal +
  • Perl +
  • PHP +
  • Pike +
  • plural form formulas +
  • plural forms +
  • plural forms, in MO files
  • plural forms, in PO files
  • PO files' format
  • PO mode (Emacs) commands
  • PO template file -
  • portability problems with sed -
  • `POTFILES.in´ file +
  • portability problems with sed +
  • `POTFILES.in´ file
  • preparing programs for translation -
  • problems with catgets interface -
  • programming languages -
  • Python +
  • problems with catgets interface +
  • programming languages +
  • Python

    • q

    -
  • quotation marks, quotation marks -
  • quote characters, use in PO files +
  • quotation marks, quotation marks +
  • quote characters, use in PO files

    • r

    -
  • related reading -
  • RST +
  • related reading +
  • RST

    • s

    -
  • scripting languages -
  • search messages in a catalog -
  • selecting message language +
  • scripting languages +
  • search messages in a catalog +
  • selecting message language
  • sentences -
  • setting up gettext at build time -
  • setting up gettext at run time -
  • several domains +
  • setting up gettext at build time +
  • setting up gettext at run time +
  • several domains
  • sex -
  • sgettext +
  • sgettext
  • she, he, and they -
  • shell scripts -
  • Smalltalk -
  • sorting msgcat output -
  • sorting msgmerge output -
  • sorting msgunfmt output -
  • sorting output of xgettext -
  • specifying plural form in a PO file -
  • standard output, and msgcat -
  • standard output, and msgmerge program +
  • shell scripts +
  • Smalltalk +
  • sorting msgcat output +
  • sorting msgmerge output +
  • sorting msgunfmt output +
  • sorting output of xgettext +
  • specifying plural form in a PO file +
  • standard output, and msgcat +
  • standard output, and msgmerge program
  • string concatenation
  • string normalization in entries
  • style @@ -370,45 +370,45 @@ Jump to:

    • t

    -
  • Tcl -
  • Tcl mode, and msgfmt program -
  • Tcl mode, and msgunfmt program +
  • Tcl +
  • Tcl mode, and msgfmt program +
  • Tcl mode, and msgunfmt program
  • template PO file -
  • testing `.po´ files for equivalence -
  • Tk's scripting language -
  • translated entries -
  • translating menu entries +
  • testing `.po´ files for equivalence +
  • Tk's scripting language +
  • translated entries +
  • translating menu entries
  • translation aspects -
  • Translation Matrix +
  • Translation Matrix
  • Translation Project -
  • turning off NLS support +
  • turning off NLS support
  • tutorial of gettext usage

    • u

    -
  • unify duplicate translations -
  • untranslated entries -
  • update translations from a compendium -
  • upgrading to new versions of gettext +
  • unify duplicate translations +
  • untranslated entries +
  • update translations from a compendium +
  • upgrading to new versions of gettext

    • v

    -
  • version control for backup files, msgmerge +
  • version control for backup files, msgmerge

    • w

    -
  • wxWindows library +
  • wxWindows library

    • x

    -
  • xargs, and output from msgexec +
  • xargs, and output from msgexec
  • xgettext program, usage -
  • xmodmap program, and typing quotation marks +
  • xmodmap program, and typing quotation marks

    • y

    -
  • YaST2 scripting language -
  • YCP +
  • YaST2 scripting language +
  • YCP

    • diff --git a/doc/gettext_3.html b/doc/gettext_3.html index 647bedde2..147c55749 100644 --- a/doc/gettext_3.html +++ b/doc/gettext_3.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 3 Preparing Program Sources @@ -29,7 +29,7 @@ needing translation.

    Presuming that your set of programs, or package, has been adjusted so all needed GNU gettext files are available, and your -`Makefile´ files are adjusted (see section 12 The Maintainer's View), each C module +`Makefile´ files are adjusted (see section 12 The Maintainer's View), each C module having translated C strings should contain the line:

    diff --git a/doc/gettext_4.html b/doc/gettext_4.html index 00b3baa42..026c8512f 100644 --- a/doc/gettext_4.html +++ b/doc/gettext_4.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 4 Making the PO Template File @@ -136,8 +136,8 @@ is written to standard output. Specifies the language of the input files. The supported languages are C, C++, ObjectiveC, PO, Python, -Lisp, EmacsLisp, librep, Java, awk, -YCP, Tcl, RST, Glade. +Lisp, EmacsLisp, librep, Smalltalk, Java, +awk, YCP, Tcl, PHP, RST, Glade.
    `-C´
    @@ -156,7 +156,27 @@ extension.

    -

    4.1.4 Operation mode

    +

    4.1.4 Input file interpretation

    + +
    + +
    `--from-code=name´ +
    + +Specifies the encoding of the input files. This option is needed only +if some untranslated message strings or their corresponding comments +contain non-ASCII characters. Note that Python, Tcl, and Glade input +files are always assumed to be in UTF-8, regardless of this option. + +
    + +

    +By default the input files are assumed to be in ASCII. + +

    + + +

    4.1.5 Operation mode

    @@ -164,16 +184,16 @@ extension.
    `--join-existing´
    - + Join messages with existing file.
    `-x file´
    `--exclude-file=file´
    - + Entries from file are not extracted. file should be a PO or POT file. @@ -181,8 +201,8 @@ POT file.
    `--add-comments[=tag]´
    - + Place comment block with tag (or those preceding keyword lines) in output file. @@ -190,7 +210,7 @@ in output file. -

    4.1.5 Language=C/C++ specific options

    +

    4.1.6 Language=C/C++ specific options

    @@ -198,20 +218,20 @@ in output file.
    `--extract-all´
    - + Extract all strings.
    `-k keywordspec´
    `--keyword[=keywordspec]´
    - + Additional keyword to be looked for (without keywordspec means not to use default keywords). - + If keywordspec is a C identifer id, xgettext looks for strings in the first argument of each call to the function or macro id. If keywordspec is of the form @@ -231,15 +251,15 @@ explicitly disabled, are gettext, dgettext:2,
    `--trigraphs´
    - + Understand ANSI C trigraphs for input.
    `--debug´
    - + Use the flags c-format and possible-c-format to show who was responsible for marking a message as a format string. The latter form is used if the xgettext program decided, the format form is used if @@ -258,39 +278,39 @@ adjacent strings, and escaped end of lines for continued strings.

    -

    4.1.6 Output details

    +

    4.1.7 Output details

    `--force-po´
    - + Always write an output file even if no message is defined.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `-n´
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -299,15 +319,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -316,9 +336,9 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -326,16 +346,16 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    `--omit-header´
    - + Don't write header with `msgid ""´ entry. - + This is useful for testing purposes because it eliminates a source of variance for generated .gmo files. With --omit-header, two invocations of xgettext on the same files with the same @@ -343,7 +363,7 @@ options at different times are guaranteed to produce the same results.
    `--copyright-holder=string´
    - + Set the copyright holder in the output. string should be the copyright holder of the surrounding package. (Note that the msgstr strings, extracted from the package's sources, belong to the copyright @@ -359,7 +379,7 @@ simply because xgettext was first used in the GNU project.
    `--foreign-user´
    - + Omit FSF copyright in output. This option is equivalent to `--copyright-holder="´. It can be useful for packages outside the GNU project that want their translations to be in the public domain. @@ -368,23 +388,23 @@ project that want their translations to be in the public domain.
    `--msgstr-prefix[=string]´
    - + Use string (or "" if not specified) as prefix for msgstr entries.
    `-M [string]´
    `--msgstr-suffix[=string]´
    - + Use string (or "" if not specified) as suffix for msgstr entries.
    -

    4.1.7 Informative output

    +

    4.1.8 Informative output

    @@ -392,16 +412,16 @@ Use string (or "" if not specified) as suffix for msgstr entries.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    diff --git a/doc/gettext_5.html b/doc/gettext_5.html index 7972b1072..1d1a4d36a 100644 --- a/doc/gettext_5.html +++ b/doc/gettext_5.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 5 Creating a New PO File @@ -10,9 +10,9 @@ Go to the first, previous<

    -

    5 Creating a New PO File

    +

    5 Creating a New PO File

    - +

    @@ -31,7 +31,7 @@ For example: 

     $ cd PACKAGE-VERSION
 $ cd po
-$ msginit --verbose
+$ msginit

    @@ -44,26 +44,26 @@ the header entry of this file. -

    5.1 Invoking the msginit Program

    +

    5.1 Invoking the msginit Program

    - + 

     msginit [option]

    - + The msginit program creates a new PO file, initializing the meta information with values from the user's environment.

    -

    5.1.1 Input file location

    +

    5.1.1 Input file location

    @@ -71,8 +71,8 @@ information with values from the user's environment.
    `--input=inputfile´
    - + Input POT file.
    @@ -84,7 +84,7 @@ POT file. If it is `-´, standard input is read.

    -

    5.1.2 Output file location

    +

    5.1.2 Output file location

    @@ -92,8 +92,8 @@ POT file. If it is `-´, standard input is read.
    `--output-file=file´
    - + Write output to specified PO file.
    @@ -106,7 +106,7 @@ standard output.

    -

    5.1.3 Output details

    +

    5.1.3 Output details

    @@ -114,15 +114,15 @@ standard output.
    `--locale=ll_CC´
    - + Set target locale. ll should be a language code, and CC should be a country code. The command `locale -a´ can be used to output a list of all installed locales. The default is the user's locale setting.
    `--no-translator´
    - + Declares that the PO file will not have a human translator and is instead automatically generated. @@ -130,15 +130,15 @@ automatically generated.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -147,7 +147,7 @@ lines which are wider than the output page width will be split. -

    5.1.4 Informative output

    +

    5.1.4 Informative output

    @@ -155,25 +155,25 @@ lines which are wider than the output page width will be split.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    5.2 Filling in the Header Entry

    +

    5.2 Filling in the Header Entry

    - +

    @@ -218,7 +218,7 @@ Before starting a translation, it is a good idea to get in touch with your translation team, not only to make sure you don't do duplicated work, but also to coordinate difficult linguistic issues. - + In the Free Translation Project, each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, http://www.iro.umontreal.ca/contrib/po/HTML/, @@ -226,14 +226,14 @@ in the "National teams" area.

    Content-Type
    - + Replace `CHARSET´ with the character encoding used for your language, in your locale, or UTF-8. This field is needed for correct operation of the msgmerge and msgfmt programs, as well as for users whose -locale's character encoding differs from yours (see section 10.2.4 How to specify the output character set gettext uses). +locale's character encoding differs from yours (see section 10.2.4 How to specify the output character set gettext uses). - + You get the character encoding of your locale by running the shell command `locale charmap´. If the result is `C´ or `ANSI_X3.4-1968´, which is equivalent to `ASCII´ (= `US-ASCII´), it means that your @@ -241,7 +241,7 @@ locale is not correctly configured. In this case, ask your translation team which charset to use. `ASCII´ is not usable for any language except Latin. - + Because the PO files must be portable to operating systems with less advanced internationalization facilities, the character encodings that can be used are limited to those supported by both GNU libc and GNU @@ -258,11 +258,11 @@ are limited to those supported by both GNU libc and GNU BIG5, BIG5-HKSCS, GBK, GB18030, SHIFT_JIS, JOHAB, TIS-620, VISCII, GEORGIAN-PS, UTF-8. - + In the GNU system, the following encodings are frequently used for the corresponding languages. - +
    • ISO-8859-1 for @@ -322,8 +322,8 @@ corresponding languages.
    - + When single quote characters or double quote characters are used in translations for your language, and your locale's encoding is one of the ISO-8859-* charsets, it is best if you create your PO files in UTF-8 @@ -335,7 +335,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the vertical apostrophe and the vertical double quote instead (because that's what the character set conversion will transliterate them to). - + To enter such quote characters under X11, you can change your keyboard mapping using the xmodmap program. The X11 names of the quote characters are "leftsinglequotemark", "rightsinglequotemark", @@ -357,7 +357,7 @@ Set this to 8bit.
    This field is optional. It is only needed if the PO file has plural forms. You can find them by searching for the `msgid_plural´ keyword. The -format of the plural forms field is described in section 10.2.5 Additional functions for plural forms. +format of the plural forms field is described in section 10.2.5 Additional functions for plural forms.

    diff --git a/doc/gettext_6.html b/doc/gettext_6.html index 53465579b..219030182 100644 --- a/doc/gettext_6.html +++ b/doc/gettext_6.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 6 Updating Existing PO Files @@ -10,15 +10,15 @@ Go to the first, previous<

    -

    6 Updating Existing PO Files

    +

    6 Updating Existing PO Files

    -

    6.1 Invoking the msgmerge Program

    +

    6.1 Invoking the msgmerge Program

    - + 

     msgmerge [option] def.po ref.pot
@@ -39,7 +39,7 @@ is used to produce better results.
 
    
 
 
-
    6.1.1  Input file location
    
+
    6.1.1  Input file location
    
 
 
    
 
@@ -55,8 +55,8 @@ References to the new sources.
 
    
 
    `--directory=directory´
 
    
-
 
+
 Add directory to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting `.po´
 file will be written relative to the current directory, though.
@@ -65,16 +65,16 @@ file will be written relative to the current directory, though.
 
    
 
    `--compendium=file´
 
    
-
 
-Specify an additional library of message translations.  See section 6.11  Using Translation Compendia.
+
+Specify an additional library of message translations.  See section 6.11  Using Translation Compendia.
 This option may be specified more than once.
 
 
    
 
 
 
-
    6.1.2  Operation mode
    
+
    6.1.2  Operation mode
    
 
 
    
 
@@ -82,15 +82,15 @@ This option may be specified more than once.
 
    
 
    `--update´
 
    
-
 
+
 Update def.po.  Do nothing if def.po is already up to date.
 
 
    
 
 
 
-
    6.1.3  Output file location
    
+
    6.1.3  Output file location
    
 
 
    
 
@@ -98,21 +98,21 @@ Update def.po.  Do nothing if def.po is already up to date
 
    
 
    `--output-file=file´
 
    
-
 
+
 Write output to specified file.
 
 
    
 
 
    
-
+
 The results are written to standard output if no output file is specified
 or if it is `-´.
 
 
    
 
 
-
    6.1.4  Output file location in update mode
    
+
    6.1.4  Output file location in update mode
    
 
 
    
 The result is written back to def.po.
@@ -122,19 +122,19 @@ The result is written back to def.po.
 
 
    `--backup=control´
 
    
-
 
+
 Make a backup of def.po
 
 
    `--suffix=suffix´
 
    
-
+
 Override the usual backup suffix.

    - + The version control method may be selected via the --backup option or through the VERSION_CONTROL environment variable. Here are the values: @@ -176,7 +176,7 @@ The backup suffix is `~´, unless set with --suffix -

    6.1.5 Operation modifiers

    +

    6.1.5 Operation modifiers

    @@ -184,44 +184,44 @@ The backup suffix is `~´, unless set with --suffix
    `--multi-domain´
    - + Apply ref.pot to each of the domains in def.po.
    -

    6.1.6 Output details

    +

    6.1.6 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -230,15 +230,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -247,9 +247,9 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -257,15 +257,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    6.1.7 Informative output

    +

    6.1.7 Informative output

    @@ -273,24 +273,24 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    `-v´
    `--verbose´
    - + Increase verbosity level.
    `-q´ @@ -299,30 +299,30 @@ Increase verbosity level.
    `--silent´
    - + Suppress progress indicators.
    -

    6.2 Translated Entries

    +

    6.2 Translated Entries

    - +

    Each PO file entry for which the msgstr field has been filled with -a translation, and which is not marked as fuzzy (see section 6.3 Fuzzy Entries), +a translation, and which is not marked as fuzzy (see section 6.3 Fuzzy Entries), is said to be a translated entry. Only translated entries will later be compiled by GNU msgfmt and become usable in programs. Other entry types will be excluded; translation will not occur for them.

    - + Some commands are more specifically related to translated entry processing.

    @@ -330,21 +330,21 @@ Some commands are more specifically related to translated entry processing.
    t
    - + Find the next translated entry (po-next-translated-entry).
    T
    - + Find the previous translated entry (po-previous-translated-entry).

    - + The commands t (po-next-translated-entry) and T (po-previous-translated-entry) move forwards or backwards, chasing for an translated entry. If none is found, the search is extended and @@ -352,25 +352,25 @@ wraps around in the PO file buffer.

    - + Translated entries usually result from the translator having edited in -a translation for them, section 6.6 Modifying Translations. However, if the +a translation for them, section 6.6 Modifying Translations. However, if the variable po-auto-fuzzy-on-edit is not nil, the entry having received a new translation first becomes a fuzzy entry, which ought to be later unfuzzied before becoming an official, genuine translated entry. -See section 6.3 Fuzzy Entries. +See section 6.3 Fuzzy Entries.

    -

    6.3 Fuzzy Entries

    +

    6.3 Fuzzy Entries

    - +

    - + Each PO file entry may have a set of attributes, which are qualities given a name and explicitly associated with the translation, using a special system comment. One of these attributes @@ -393,7 +393,7 @@ might mark some entries as being fuzzy.

    - + Also, the translator may decide herself to mark an entry as fuzzy for her own convenience, when she wants to remember that the entry has to be later revisited. So, some commands are more specifically @@ -404,26 +404,26 @@ related to fuzzy entry processing.

    z
    - + Find the next fuzzy entry (po-next-fuzzy-entry).
    Z
    - + Find the previous fuzzy entry (po-previous-fuzzy-entry).
    TAB
    - + Remove the fuzzy attribute of the current entry (po-unfuzzy).

    - + The commands z (po-next-fuzzy-entry) and Z (po-previous-fuzzy-entry) move forwards or backwards, chasing for a fuzzy entry. If none is found, the search is extended and wraps @@ -431,9 +431,9 @@ around in the PO file buffer.

    - + The command TAB (po-unfuzzy) removes the fuzzy attribute associated with an entry, usually leaving it translated. Further, if the variable po-auto-select-on-unfuzzy has not @@ -455,8 +455,8 @@ to chase another entry, leaving the entry fuzzy.

    - + The translator may also use the DEL command (po-fade-out-entry) over any translated entry to mark it as being fuzzy, when she wants to easily leave a trace she wants to later return @@ -471,9 +471,9 @@ still exists.

    -

    6.4 Untranslated Entries

    +

    6.4 Untranslated Entries

    - +

    @@ -493,7 +493,7 @@ are easily recognizable by the fact they end with `msgstr ""´

    - + The work of the translator might be (quite naively) seen as the process of seeking for an untranslated entry, editing a translation for it, and repeating these actions until no untranslated entries remain. @@ -505,26 +505,26 @@ processing.

    u
    - + Find the next untranslated entry (po-next-untranslated-entry).
    U
    - + Find the previous untranslated entry (po-previous-untransted-entry).
    k
    - + Turn the current entry into an untranslated one (po-kill-msgstr).

    - + The commands u (po-next-untranslated-entry) and U (po-previous-untransted-entry) move forwards or backwards, chasing for an untranslated entry. If none is found, the search is @@ -532,11 +532,11 @@ extended and wraps around in the PO file buffer.

    - + An entry can be turned back into an untranslated entry by merely emptying its translation, using the command k -(po-kill-msgstr). See section 6.6 Modifying Translations. +(po-kill-msgstr). See section 6.6 Modifying Translations.

    @@ -547,9 +547,9 @@ if some untranslated string still exists.

    -

    6.5 Obsolete Entries

    +

    6.5 Obsolete Entries

    - +

    @@ -575,7 +575,7 @@ after the fact.

    - + Moreover, some commands are more specifically related to obsolete entry processing. @@ -584,27 +584,27 @@ entry processing.

    o
    - + Find the next obsolete entry (po-next-obsolete-entry).
    O
    - + Find the previous obsolete entry (po-previous-obsolete-entry).
    DEL
    - + Make an active entry obsolete, or zap out an obsolete entry (po-fade-out-entry).

    - + The commands o (po-next-obsolete-entry) and O (po-previous-obsolete-entry) move forwards or backwards, chasing for an obsolete entry. If none is found, the search is @@ -620,10 +620,10 @@ introducing useless msgid values.

    - + However, it is possible to comment out an active entry, so making it obsolete. GNU gettext utilities will later react to the disappearance of a translation by using the untranslated string. @@ -633,7 +633,7 @@ translated entry), then it is first made fuzzy. If it is already fuzzy, then the entry is merely commented out, with confirmation. If the entry is already obsolete, then it is completely deleted from the PO file. It is easy to recycle the translation so deleted into some other PO file -entry, usually one which is untranslated. See section 6.6 Modifying Translations. +entry, usually one which is untranslated. See section 6.6 Modifying Translations.

    @@ -651,10 +651,10 @@ merely tries to provide handy tools for helping her to do so.

    -

    6.6 Modifying Translations

    +

    6.6 Modifying Translations

    - +

    @@ -680,40 +680,40 @@ using the following commands for modifying the translations.

    RET
    - + Interactively edit the translation (po-edit-msgstr).
    LFD
    C-j
    - + Reinitialize the translation with the original, untranslated string (po-msgid-to-msgstr).
    k
    - + Save the translation on the kill ring, and delete it (po-kill-msgstr).
    w
    - + Save the translation on the kill ring, without deleting it (po-kill-ring-save-msgstr).
    y
    - + Replace the translation, taking the new from the kill ring (po-yank-msgstr).

    - + The command RET (po-edit-msgstr) opens a new Emacs window meant to edit in a new translation, or to modify an already existing translation. The new window contains a copy of the translation taken from @@ -721,14 +721,14 @@ the current PO file entry, all ready for edition, expunged of all quoting marks, fully modifiable and with the complete extent of Emacs modifying commands. When the translator is done with her modifications, she may use C-c C-c to close the subedit window with the automatically requoted -results, or C-c C-k to abort her modifications. See section 6.8 Details of Sub Edition, +results, or C-c C-k to abort her modifications. See section 6.8 Details of Sub Edition, for more information.

    - + The command LFD (po-msgid-to-msgstr) initializes, or reinitializes the translation with the original string. This command is normally used when the translator wants to redo a fresh translation of @@ -736,7 +736,7 @@ the original string, disregarding any previous work.

    - + It is possible to arrange so, whenever editing an untranslated entry, the LFD command be automatically executed. If you set po-auto-edit-with-msgid to t, the translation gets @@ -745,7 +745,7 @@ The default value for po-auto-edit-with-msgid is nil.

    - + In fact, whether it is best to start a translation with an empty string, or rather with a copy of the original string, is a matter of taste or habit. Sometimes, the source language and the @@ -759,11 +759,11 @@ if this requires some extra editing work to get rid of the original.

    - + The command k (po-kill-msgstr) merely empties the translation string, so turning the entry into an untranslated one. But while doing so, its previous contents is put apart in @@ -795,8 +795,8 @@ entries, the translation is also uncommented prior to saving.

    - + The command y (po-yank-msgstr) completely replaces the translation of the current entry by a string taken from the kill ring. Following Emacs terminology, we then say that the replacement @@ -830,7 +830,7 @@ yanking commands themselves.

    - + To better illustrate the operation of killing and yanking, let's use an actual example, taken from a common situation. When the programmer slightly modifies some string right in the program, his @@ -868,10 +868,10 @@ See section `Keyboard Macros' in The Emacs Editor.

    -

    6.7 Modifying Comments

    +

    6.7 Modifying Comments

    - +

    @@ -893,31 +893,31 @@ they are not meant for the translator to modify. See section 6.6 Modifying Translations. +so the general indications given for those apply here. See section 6.6 Modifying Translations.

    #
    - + Interactively edit the translator comments (po-edit-comment).
    K
    - + Save the translator comments on the kill ring, and delete it (po-kill-comment).
    W
    - + Save the translator comments on the kill ring, without deleting it (po-kill-ring-save-comment).
    Y
    - + Replace the translator comments, taking the new from the kill ring (po-yank-comment). @@ -929,12 +929,12 @@ strings, and behave much the same way as they do, except that they handle this part of PO file comments meant for translator usage, rather than the translation strings. So, if the descriptions given below are slightly succinct, it is because the full details have already been given. -See section 6.6 Modifying Translations. +See section 6.6 Modifying Translations.

    - + The command # (po-edit-comment) opens a new Emacs window containing a copy of the translator comments on the current PO file entry. If there are no such comments, PO mode understands that the translator wants @@ -944,22 +944,22 @@ removed before edition, and reinstated after. For translator comments pertaining to obsolete entries, the uncommenting and recommenting operations are done twice. Once in the editing window, the keys C-c C-c allow the translator to tell she is finished with editing the comment. -See section 6.8 Details of Sub Edition, for further details. +See section 6.8 Details of Sub Edition, for further details.

    - + Functions found on po-subedit-mode-hook, if any, are executed after the string has been inserted in the edit buffer.

    - + The command K (po-kill-comment) gets rid of all translator comments, while saving those comments on the kill ring. The command W (po-kill-ring-save-comment) takes @@ -998,9 +998,9 @@ regular Emacs commands C-y (yank) and M-y

    -

    6.8 Details of Sub Edition

    +

    6.8 Details of Sub Edition

    - +

    @@ -1013,25 +1013,25 @@ of Emacs, which are described below.

    C-c C-c
    - + Complete edition (po-subedit-exit).
    C-c C-k
    - + Abort edition (po-subedit-abort).
    C-c C-a
    - + Consult auxiliary PO files (po-subedit-cycle-auxiliary).

    - + The window's contents represents a translation for a given message, or a translator comment. The translator may modify this window to her heart's content. Once this is done, the command C-c C-c @@ -1041,8 +1041,8 @@ sight or if buffers were switched.

    - + If the translator becomes unsatisfied with her translation or comment, to the extent she prefers keeping what was existent prior to the RET or # command, she may use the command C-c C-k @@ -1053,14 +1053,14 @@ whole effect of last edition.

    - + The command C-c C-a (po-subedit-cycle-auxiliary) allows for glancing through translations already achieved in other languages, directly while editing the current translation. This may be quite convenient when the translator is fluent at many languages, but of course, only makes sense when such completed -auxiliary PO files are already available to her (see section 6.10 Consulting Auxiliary PO Files). +auxiliary PO files are already available to her (see section 6.10 Consulting Auxiliary PO Files).

    @@ -1088,7 +1088,7 @@ in the editing window, as ending with two < in a row.

    - + When a translation (or a comment) is being edited, the translator may move the cursor back into the PO file buffer and freely move to other entries, browsing at will. If, with an edition pending, the translator wanders in the @@ -1101,7 +1101,7 @@ the translator should better be comfortable at handling many Emacs windows!

    - + Pending subedits may be completed or aborted in any order, regardless of how or when they were started. When many subedits are pending and the translator asks for quitting the PO file (with the q command), subedits @@ -1110,11 +1110,11 @@ are automatically resumed one at a time, so she may decide for each of them.

    -

    6.9 C Sources Context

    +

    6.9 C Sources Context

    - +

    @@ -1151,7 +1151,7 @@ overall organization, than to the program code itself.

    - + The following commands are meant to help the translator at getting program source context for a PO file entry. @@ -1160,35 +1160,35 @@ program source context for a PO file entry.

    s
    - + Resume the display of a program source context, or cycle through them (po-cycle-source-reference).
    M-s
    - + Display of a program source context selected by menu (po-select-source-reference).
    S
    - + Add a directory to the search path for source files (po-consider-source-path).
    M-S
    - + Delete a directory from the search path for source files (po-ignore-source-path).

    - + The commands s (po-cycle-source-reference) and M-s (po-select-source-reference) both open another window displaying some source program file, and already positioned in such a way that @@ -1233,10 +1233,10 @@ available for a single string to translate.

    - + Program source files are usually found relative to where the PO file stands. As a special provision, when this fails, the file is also looked for, but relative to the directory immediately above it. @@ -1254,9 +1254,9 @@ one of the directories she does not want anymore on the search path.

    -

    6.10 Consulting Auxiliary PO Files

    +

    6.10 Consulting Auxiliary PO Files

    - +

    @@ -1269,8 +1269,8 @@ at once, for translators preferring to work in this way.

    - + An auxiliary PO file is an existing PO file meant for the same package the translator is working on, but targeted to a different mother tongue language. Commands exist for declaring and handling auxiliary @@ -1285,41 +1285,41 @@ Here are the auxiliary file commands available in PO mode.

    a
    - + Seek auxiliary files for another translation for the same entry (po-cycle-auxiliary).
    C-c C-a
    - + Switch to a particular auxiliary file (po-select-auxiliary).
    A
    - + Declare this PO file as an auxiliary file (po-consider-as-auxiliary).
    M-A
    - + Remove this PO file from the list of auxiliary files (po-ignore-as-auxiliary).

    - + Command A (po-consider-as-auxiliary) adds the current PO file to the list of auxiliary files, while command M-A (po-ignore-as-auxiliary just removes it.

    - + The command a (po-cycle-auxiliary) seeks all auxiliary PO files, round-robin, searching for a translated entry in some other language having an msgid field identical as the one for the current entry. @@ -1331,8 +1331,8 @@ so repeating a will eventually yield back the original PO file.

    - + The command C-c C-a (po-select-auxiliary) asks the translator for her choice of a particular auxiliary file, with completion, and then switches to that selected PO file. The command also checks if @@ -1352,7 +1352,7 @@ their msgid entries written by the same GNU gettext to

    - + However, PO files initially created by PO mode itself, while marking strings in source files, are normalised differently. So are PO files resulting of the the `M-x normalize´ command. Until these @@ -1362,13 +1362,13 @@ fully resolved, the translator should stay aware of normalisation issues.

    -

    6.11 Using Translation Compendia

    +

    6.11 Using Translation Compendia

    - +

    - + A compendium is a special PO file containing a set of translations recurring in many different packages. The translator can use gettext tools to build a new compendium, to add entries to her @@ -1379,10 +1379,10 @@ already translated entries, from translations kept in the compendium. -

    6.11.1 Creating Compendia

    +

    6.11.1 Creating Compendia

    - +

    @@ -1394,11 +1394,11 @@ files and extracting a message subset from a PO file.

    -

    6.11.1.1 Concatenate PO Files

    +

    6.11.1.1 Concatenate PO Files

    - + To concatenate several valid PO files into one compendium file you can use `msgcomm´ or `msgcat´ (the latter preferred): @@ -1477,9 +1477,9 @@ files or postprocess the result using `msgattrib --translated --no-fuzzy&a

    -

    6.11.1.2 Extract a Message Subset from a PO File

    +

    6.11.1.2 Extract a Message Subset from a PO File

    - +

    @@ -1499,7 +1499,7 @@ msggrep --location src/getopt.c -o compendium.po file.po -

    6.11.2 Using Compendia

    +

    6.11.2 Using Compendia

    You can use a compendium file to initialize a translation from scratch @@ -1508,9 +1508,9 @@ or to update an already existing translation.

    -

    6.11.2.1 Initialize a New Translation File

    +

    6.11.2.1 Initialize a New Translation File

    - +

    @@ -1525,9 +1525,9 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot -

    6.11.2.2 Update an Existing Translation File

    +

    6.11.2.2 Update an Existing Translation File

    - +

    diff --git a/doc/gettext_7.html b/doc/gettext_7.html index 2831ce2f0..3add0beb6 100644 --- a/doc/gettext_7.html +++ b/doc/gettext_7.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 7 Manipulating PO Files @@ -10,9 +10,9 @@ Go to the first, previous<

    -

    7 Manipulating PO Files

    +

    7 Manipulating PO Files

    - +

    @@ -22,7 +22,7 @@ complete set of tools for this purpose.

    - + When merging two packages into a single package, the resulting POT file will be the concatenation of the two packages' POT files. Thus the maintainer must concatenate the two existing package translations into @@ -32,7 +32,7 @@ possible conflicts that arose during the merge.

    - + When a translator takes over the translation job from another translator, but she uses a different character encoding in her locale, she will convert the catalog to her character encoding. This is best done through @@ -48,8 +48,8 @@ that source file and use `msgmerge´.

    - + When a translator wants to adjust some translation catalog for a special dialect or orthography -- for example, German as written in Switzerland versus German as written in Germany -- she needs to apply some text @@ -66,14 +66,14 @@ that's why it's better to use the original POT file if available.

    - + When a translator wants to check her translations, for example according to orthography rules or using a non-interactive spell checker, she can do so using the `msgexec´ program.

    - + When third party tools create PO or POT files, sometimes duplicates cannot be avoided. But the GNU gettext tools give an error when they encounter duplicate msgids in the same file and in the same domain. @@ -91,7 +91,7 @@ completely translated.

    - + `msgattrib´ can be used to select and extract only the fuzzy or untranslated messages of a translation catalog. @@ -104,19 +104,19 @@ catalogs. It copies each message's msgid to its msgstr. -

    7.1 Invoking the msgcat Program

    +

    7.1 Invoking the msgcat Program

    - + 

     msgcat [option] [inputfile]...

    - + The msgcat program concatenates and merges the specified PO files. It finds messages which are common to two or more of the specified PO files. By using the --more-than option, greater commonality may be requested @@ -130,7 +130,7 @@ to define them. File positions from all PO files will be cumulated.

    -

    7.1.1 Input file location

    +

    7.1.1 Input file location

    @@ -142,8 +142,8 @@ Input files.
    `--files-from=file´
    - + Read the names of the input files from file instead of getting them from the command line. @@ -151,8 +151,8 @@ them from the command line.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -165,7 +165,7 @@ If inputfile is `-´, standard input is read.

    -

    7.1.2 Output file location

    +

    7.1.2 Output file location

    @@ -173,21 +173,21 @@ If inputfile is `-´, standard input is read.
    `--output-file=file´
    - + Write output to specified file.

    - + The results are written to standard output if no output file is specified or if it is `-´.

    -

    7.1.3 Message selection

    +

    7.1.3 Message selection

    @@ -195,8 +195,8 @@ or if it is `-´.
    `--less-than=number´
    - + Print messages with less than number definitions, defaults to infinite if not set. @@ -204,8 +204,8 @@ if not set.
    `--more-than=number´
    - + Print messages with more than number definitions, defaults to 0 if not set. @@ -213,8 +213,8 @@ set.
    `--unique´
    - + Shorthand for `--less-than=2´. Requests that only unique messages be printed. @@ -222,7 +222,7 @@ printed. -

    7.1.4 Output details

    +

    7.1.4 Output details

    @@ -230,45 +230,45 @@ printed.
    `--to-code=name´
    - + Specify encoding for output.
    `--use-first´
    - + Use first available translation for each message. Don't merge several translations into one.
    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `-n´
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -277,15 +277,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -294,9 +294,9 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -304,15 +304,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.1.5 Informative output

    +

    7.1.5 Informative output

    @@ -320,41 +320,41 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.2 Invoking the msgconv Program

    +

    7.2 Invoking the msgconv Program

    - + 

     msgconv [option] [inputfile]

    - + The msgconv program converts a translation catalog to a different character encoding.

    -

    7.2.1 Input file location

    +

    7.2.1 Input file location

    @@ -366,8 +366,8 @@ Input PO file.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -380,7 +380,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.2.2 Output file location

    +

    7.2.2 Output file location

    @@ -388,8 +388,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - + Write output to specified file.
    @@ -401,7 +401,7 @@ or if it is `-´.

    -

    7.2.3 Conversion target

    +

    7.2.3 Conversion target

    @@ -409,8 +409,8 @@ or if it is `-´.
    `--to-code=name´
    - + Specify encoding for output.
    @@ -421,36 +421,36 @@ The default encoding is the current locale's encoding.

    -

    7.2.4 Output details

    +

    7.2.4 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -459,15 +459,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -476,8 +476,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -485,15 +485,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.2.5 Informative output

    +

    7.2.5 Informative output

    @@ -501,41 +501,41 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.3 Invoking the msggrep Program

    +

    7.3 Invoking the msggrep Program

    - + 

     msggrep [option] [inputfile]

    - + The msggrep program extracts all messages of a translation catalog that match a given pattern or belong to some given source files.

    -

    7.3.1 Input file location

    +

    7.3.1 Input file location

    @@ -547,8 +547,8 @@ Input PO file.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -561,7 +561,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.3.2 Output file location

    +

    7.3.2 Output file location

    @@ -569,8 +569,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - + Write output to specified file.
    @@ -582,7 +582,7 @@ or if it is `-´.

    -

    7.3.3 Message selection

    +

    7.3.3 Message selection

    @@ -632,8 +632,8 @@ expressions if -E is given, or fixed strings if -F is given.
 
    
 
    `--location=sourcefile´
 
    
-
 
+
 Select messages extracted from sourcefile.  sourcefile can be
 either a literal file name or a wildcard pattern.
 
@@ -641,97 +641,97 @@ either a literal file name or a wildcard pattern.
 
    
 
    `--domain=domainname´
 
    
-
 
+
 Select messages belonging to domain domainname.
 
 
    `-K´
 
    
 
    `--msgid´
 
    
-
 
+
 Start of patterns for the msgid.
 
 
    `-T´
 
    
 
    `--msgstr´
 
    
-
 
+
 Start of patterns for the msgstr.
 
 
    `-E´
 
    
 
    `--extended-regexp´
 
    
-
 
+
 Specify that pattern is an extended regular expression.
 
 
    `-F´
 
    
 
    `--fixed-strings´
 
    
-
 
+
 Specify that pattern is a set of newline-separated strings.
 
 
    `-e pattern´
 
    
 
    `--regexp=pattern´
 
    
-
 
+
 Use pattern as a regular expression.
 
 
    `-f file´
 
    
 
    `--file=file´
 
    
-
 
+
 Obtain pattern from file.
 
 
    `-i´
 
    
 
    `--ignore-case´
 
    
-
 
+
 Ignore case distinctions.
    -

    7.3.4 Output details

    +

    7.3.4 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -740,35 +740,35 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.3.5 Informative output

    +

    7.3.5 Informative output

    @@ -776,41 +776,41 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.4 Invoking the msgfilter Program

    +

    7.4 Invoking the msgfilter Program

    - + 

     msgfilter [option] filter [filter-option]

    - + The msgfilter program applies a filter to all translations of a translation catalog.

    -

    7.4.1 Input file location

    +

    7.4.1 Input file location

    @@ -818,16 +818,16 @@ translation catalog.
    `--input=inputfile´
    - + Input PO file.
    `-D directory´
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -840,7 +840,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.4.2 Output file location

    +

    7.4.2 Output file location

    @@ -848,8 +848,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - + Write output to specified file.
    @@ -861,7 +861,7 @@ or if it is `-´.

    -

    7.4.3 The filter

    +

    7.4.3 The filter

    The filter can be any program that reads a translation from standard @@ -870,7 +870,7 @@ used filter is `sed´.

    - + Note: It is your responsibility to ensure that the filter can cope with input encoded in the translation catalog's encoding. If the filter wants input in a particular encoding, you can in a first step @@ -883,7 +883,7 @@ locale, by using the LC_ALL environment variable.

    - + Note: Most translations in a translation catalog don't end with a newline character. For this reason, it is important that the filter recognizes its last input line even if it ends without a newline, and that @@ -895,7 +895,7 @@ does not have this limitation.

    -

    7.4.4 Useful filter-options when the filter is `sed´

    +

    7.4.4 Useful filter-options when the filter is `sed´

    @@ -903,16 +903,16 @@ does not have this limitation.
    `--expression=script´
    - + Add script to the commands to be executed.
    `-f scriptfile´
    `--file=scriptfile´
    - + Add the contents of scriptfile to the commands to be executed.
    `-n´ @@ -921,49 +921,49 @@ Add the contents of scriptfile to the commands to be executed.
    `--silent´
    - + Suppress automatic printing of pattern space.
    -

    7.4.5 Output details

    +

    7.4.5 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `--indent´
    - + Write the .po file using indented style.
    `--keep-header´
    - + Keep the header entry, i.e. the message with `msgid ""´, unmodified, instead of filtering it. By default, the header entry is subject to filtering like any other message.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -972,15 +972,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -989,8 +989,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -998,15 +998,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.4.6 Informative output

    +

    7.4.6 Informative output

    @@ -1014,35 +1014,35 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.5 Invoking the msguniq Program

    +

    7.5 Invoking the msguniq Program

    - + 

     msguniq [option] [inputfile]

    - + The msguniq program unifies duplicate translations in a translation catalog. It finds duplicate translations of the same message ID. Such duplicates are invalid input for other programs like msgfmt, @@ -1057,7 +1057,7 @@ discarded.

    -

    7.5.1 Input file location

    +

    7.5.1 Input file location

    @@ -1069,8 +1069,8 @@ Input PO file.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -1083,7 +1083,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.5.2 Output file location

    +

    7.5.2 Output file location

    @@ -1091,8 +1091,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - + Write output to specified file.
    @@ -1104,7 +1104,7 @@ or if it is `-´.

    -

    7.5.3 Message selection

    +

    7.5.3 Message selection

    @@ -1112,23 +1112,23 @@ or if it is `-´.
    `--repeated´
    - + Print only duplicates.
    `-u´
    `--unique´
    - + Print only unique messages, discard duplicates.
    -

    7.5.4 Output details

    +

    7.5.4 Output details

    @@ -1136,45 +1136,45 @@ Print only unique messages, discard duplicates.
    `--to-code=name´
    - + Specify encoding for output.
    `--use-first´
    - + Use first available translation for each message. Don't merge several translations into one.
    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `-n´
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -1183,15 +1183,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -1200,8 +1200,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1209,15 +1209,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.5.5 Informative output

    +

    7.5.5 Informative output

    @@ -1225,34 +1225,34 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.6 Invoking the msgcomm Program

    +

    7.6 Invoking the msgcomm Program

    - + 

     msgcomm [option] [inputfile]...

    - + The msgcomm program finds messages which are common to two or more of the specified PO files. By using the --more-than option, greater commonality may be requested @@ -1266,7 +1266,7 @@ cumulated.

    -

    7.6.1 Input file location

    +

    7.6.1 Input file location

    @@ -1278,8 +1278,8 @@ Input files.
    `--files-from=file´
    - + Read the names of the input files from file instead of getting them from the command line. @@ -1287,8 +1287,8 @@ them from the command line.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -1301,7 +1301,7 @@ If inputfile is `-´, standard input is read.

    -

    7.6.2 Output file location

    +

    7.6.2 Output file location

    @@ -1309,8 +1309,8 @@ If inputfile is `-´, standard input is read.
    `--output-file=file´
    - + Write output to specified file.
    @@ -1322,7 +1322,7 @@ or if it is `-´.

    -

    7.6.3 Message selection

    +

    7.6.3 Message selection

    @@ -1330,8 +1330,8 @@ or if it is `-´.
    `--less-than=number´
    - + Print messages with less than number definitions, defaults to infinite if not set. @@ -1339,8 +1339,8 @@ if not set.
    `--more-than=number´
    - + Print messages with more than number definitions, defaults to 1 if not set. @@ -1348,8 +1348,8 @@ set.
    `--unique´
    - + Shorthand for `--less-than=2´. Requests that only unique messages be printed. @@ -1357,39 +1357,39 @@ printed. -

    7.6.4 Output details

    +

    7.6.4 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `-n´
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -1398,15 +1398,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -1415,8 +1415,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1424,20 +1424,20 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    `--omit-header´
    - + Don't write header with `msgid ""´ entry.
    -

    7.6.5 Informative output

    +

    7.6.5 Informative output

    @@ -1445,34 +1445,34 @@ Don't write header with `msgid ""´ entry.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.7 Invoking the msgcmp Program

    +

    7.7 Invoking the msgcmp Program

    - + 

     msgcmp [option] def.po ref.pot

    - + The msgcmp program compares two Uniforum style .po files to check that both contain the same set of msgid strings. The def.po file is an existing PO file with the translations. The ref.pot file is the last @@ -1484,7 +1484,7 @@ used to produce better diagnostics.

    -

    7.7.1 Input file location

    +

    7.7.1 Input file location

    @@ -1500,8 +1500,8 @@ References to the sources.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. @@ -1509,7 +1509,7 @@ searched relative to this list of directories. -

    7.7.2 Operation modifiers

    +

    7.7.2 Operation modifiers

    @@ -1517,15 +1517,15 @@ searched relative to this list of directories.
    `--multi-domain´
    - + Apply ref.pot to each of the domains in def.po.
    -

    7.7.3 Informative output

    +

    7.7.3 Informative output

    @@ -1533,42 +1533,42 @@ Apply ref.pot to each of the domains in def.po.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.8 Invoking the msgattrib Program

    +

    7.8 Invoking the msgattrib Program

    - + 

     msgattrib [option] [inputfile]

    - + The msgattrib program filters the messages of a translation catalog according to their attributes, and manipulates the attributes.

    -

    7.8.1 Input file location

    +

    7.8.1 Input file location

    @@ -1580,8 +1580,8 @@ Input PO file.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -1594,7 +1594,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.8.2 Output file location

    +

    7.8.2 Output file location

    @@ -1602,8 +1602,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - + Write output to specified file.
    @@ -1615,48 +1615,48 @@ or if it is `-´.

    -

    7.8.3 Message selection

    +

    7.8.3 Message selection

    `--translated´
    - + Keep translated messages, remove untranslated messages.
    `--untranslated´
    - + Keep untranslated messages, remove translated messages.
    `--no-fuzzy´
    - + Remove `fuzzy' marked messages.
    `--only-fuzzy´
    - + Keep `fuzzy' marked messages, remove all other messsages.
    `--no-obsolete´
    - + Remove obsolete #~ messages.
    `--only-obsolete´
    - + Keep obsolete #~ messages, remove all other messages.
    -

    7.8.4 Attribute manipulation

    +

    7.8.4 Attribute manipulation

    - + Attributes are modified after the message selection/removal has been performed. @@ -1665,33 +1665,33 @@ performed.

    `--set-fuzzy´
    - + Set all messages `fuzzy'.
    `--clear-fuzzy´
    - + Set all messages non-`fuzzy'.
    `--set-obsolete´
    - + Set all messages obsolete.
    `--clear-obsolete´
    - + Set all messages non-obsolete.
    `--fuzzy´
    - + Synonym for `--only-fuzzy --clear-fuzzy´: It keeps only the fuzzy messages and removes their `fuzzy' mark.
    `--obsolete´
    - + Synonym for `--only-obsolete --clear-obsolete´: It keeps only the obsolete messages and makes them non-obsolete. @@ -1699,39 +1699,39 @@ obsolete messages and makes them non-obsolete. -

    7.8.5 Output details

    +

    7.8.5 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `-n´
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -1740,15 +1740,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -1757,8 +1757,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1766,15 +1766,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.8.6 Informative output

    +

    7.8.6 Informative output

    @@ -1782,34 +1782,34 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.9 Invoking the msgen Program

    +

    7.9 Invoking the msgen Program

    - + 

     msgen [option] inputfile

    - + The msgen program creates an English translation catalog. The input file is the last created English PO file, or a PO Template file (generally created by xgettext). Untranslated entries are assigned a @@ -1824,7 +1824,7 @@ the header entry, whereas msgen doesn't.

    -

    7.9.1 Input file location

    +

    7.9.1 Input file location

    @@ -1836,8 +1836,8 @@ Input PO or POT file.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -1850,7 +1850,7 @@ If inputfile is `-´, standard input is read.

    -

    7.9.2 Output file location

    +

    7.9.2 Output file location

    @@ -1858,8 +1858,8 @@ If inputfile is `-´, standard input is read.
    `--output-file=file´
    - + Write output to specified file.
    @@ -1871,36 +1871,36 @@ or if it is `-´.

    -

    7.9.3 Output details

    +

    7.9.3 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--no-location´
    - + Do not write `#: filename:line´ lines.
    `--add-location´
    - + Generate `#: filename:line´ lines (default).
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -1909,15 +1909,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -1926,8 +1926,8 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1935,15 +1935,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - + Sort output by file location.
    -

    7.9.4 Informative output

    +

    7.9.4 Informative output

    @@ -1951,34 +1951,34 @@ Sort output by file location.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    -

    7.10 Invoking the msgexec Program

    +

    7.10 Invoking the msgexec Program

    - + 

     msgexec [option] command [command-option]

    - + The msgexec program applies a command to all translations of a translation catalog. The command can be any program that reads a translation from standard @@ -1988,15 +1988,15 @@ across all invocations.

    - + A special builtin command called `0´ outputs the translation, followed by a null byte. The output of `msgexec 0´ is suitable as input for `xargs -0´.

    - + During each command invocation, the environment variable MSGEXEC_MSGID is bound to the message's msgid, and the environment variable MSGEXEC_LOCATION is bound to the location in the PO file @@ -2004,7 +2004,7 @@ of the message.

    - + Note: It is your responsibility to ensure that the command can cope with input encoded in the translation catalog's encoding. If the command wants input in a particular encoding, you can in a first step @@ -2018,7 +2018,7 @@ locale, by using the LC_ALL environment variable.

    -

    7.10.1 Input file location

    +

    7.10.1 Input file location

    @@ -2026,16 +2026,16 @@ locale, by using the LC_ALL environment variable.
    `--input=inputfile´
    - + Input PO file.
    `-D directory´
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -2048,7 +2048,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.10.2 Informative output

    +

    7.10.2 Informative output

    @@ -2056,16 +2056,16 @@ If no inputfile is given or if it is `-´, standard
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    diff --git a/doc/gettext_8.html b/doc/gettext_8.html index 5384d9ff8..14458b241 100644 --- a/doc/gettext_8.html +++ b/doc/gettext_8.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 8 Producing Binary MO Files @@ -10,29 +10,29 @@ Go to the first, previous<

    -

    8 Producing Binary MO Files

    +

    8 Producing Binary MO Files

    -

    8.1 Invoking the msgfmt Program

    +

    8.1 Invoking the msgfmt Program

    - + 

     msgfmt [option] filename.po ...

    - + The msgfmt programs generates a binary message catalog from a textual translation description.

    -

    8.1.1 Input file location

    +

    8.1.1 Input file location

    @@ -42,8 +42,8 @@ translation description.
    `--directory=directory´
    - + Add directory to the list of directories. Source files are searched relative to this list of directories. The resulting `.po´ file will be written relative to the current directory, though. @@ -56,7 +56,7 @@ If an input file is `-´, standard input is read.

    -

    8.1.2 Operation mode

    +

    8.1.2 Operation mode

    @@ -64,27 +64,27 @@ If an input file is `-´, standard input is read.
    `--java´
    - + Java mode: generate a Java ResourceBundle class.
    `--java2´
    - + Like --java, and assume Java2 (JDK 1.2 or higher).
    `--tcl´
    - + Tcl mode: generate a tcl/msgcat `.msg´ file.
    -

    8.1.3 Output file location

    +

    8.1.3 Output file location

    @@ -92,13 +92,13 @@ Tcl mode: generate a tcl/msgcat `.msg´ file.
    `--output-file=file´
    - + Write output to specified file.
    `--strict´
    - + Direct the program to work strictly following the Uniforum/Sun implementation. Currently this only affects the naming of the output file. If this option is not given the name of the output file is the @@ -117,7 +117,7 @@ If the output file is `-´, output is written to st

    -

    8.1.4 Output file location in Java mode

    +

    8.1.4 Output file location in Java mode

    @@ -125,22 +125,22 @@ If the output file is `-´, output is written to st
    `--resource=resource´
    - + Specify the resource name.
    `-l locale´
    `--locale=locale´
    - + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
    `-d directory´
    - + Specify the base directory of classes directory hierarchy.
    @@ -153,7 +153,7 @@ is written under the specified directory.

    -

    8.1.5 Output file location in Tcl mode

    +

    8.1.5 Output file location in Tcl mode

    @@ -161,14 +161,14 @@ is written under the specified directory.
    `--locale=locale´
    - + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
    `-d directory´
    - + Specify the base directory of `.msg´ message catalogs.
    @@ -180,7 +180,7 @@ written in the specified directory.

    -

    8.1.6 Input file interpretation

    +

    8.1.6 Input file interpretation

    @@ -188,15 +188,15 @@ written in the specified directory.
    `--check´
    - + Perform all the checks implied by --check-format, --check-header, --check-domain.
    `--check-format´
    - + Check language dependent format strings. If the string represents a format string used in a @@ -215,19 +215,19 @@ used in a printf-like function and so msgfmt might rep errors where there are none. To solve this problem the programmer can dictate the decision to the -xgettext program (see section 13.3.1 C Format Strings). The translator should not +xgettext program (see section 13.3.1 C Format Strings). The translator should not consider removing the flag from the #, line. This "fix" would be reversed again as soon as msgmerge is called the next time.
    `--check-header´
    - -Verify presence and contents of the header entry. See section 5.2 Filling in the Header Entry, + +Verify presence and contents of the header entry. See section 5.2 Filling in the Header Entry, for a description of the various fields in the header entry.
    `--check-domain´
    - + Check for conflicts between domain directives and the --output-file option @@ -235,18 +235,18 @@ option
    `--check-compatibility´
    - + Check that GNU msgfmt behaves like X/Open msgfmt. This will give an error when attempting to use the GNU extensions.
    `--check-accelerators[=char]´
    - + Check presence of keyboard accelerators for menu items. This is based on the convention used in some GUIs that a keyboard accelerator in a menu item string is designated by an immediately preceding `&´ character. @@ -261,9 +261,9 @@ instead of `&´.
    `--use-fuzzy´
    - + Use fuzzy entries in output. Note that using this option is usually wrong, because fuzzy messages are exactly those which have not been validated by a human translator. @@ -272,7 +272,7 @@ a human translator. -

    8.1.7 Output details

    +

    8.1.7 Output details

    @@ -280,13 +280,13 @@ a human translator.
    `--alignment=number´
    - + Align strings to number bytes (default: 1).
    `--no-hash´
    - + Don't include a hash table in the binary file. Lookup will be more expensive at run time (binary search instead of hash table lookup). @@ -294,7 +294,7 @@ at run time (binary search instead of hash table lookup). -

    8.1.8 Informative output

    +

    8.1.8 Informative output

    @@ -302,54 +302,54 @@ at run time (binary search instead of hash table lookup).
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    `--statistics´
    - + Print statistics about translations.
    `-v´
    `--verbose´
    - + Increase verbosity level.
    -

    8.2 Invoking the msgunfmt Program

    +

    8.2 Invoking the msgunfmt Program

    - + 

     msgunfmt [option] [file]...

    - + The msgunfmt program converts a binary message catalog to a Uniforum style .po file.

    -

    8.2.1 Operation mode

    +

    8.2.1 Operation mode

    @@ -357,22 +357,22 @@ Uniforum style .po file.
    `--java´
    - + Java mode: input is a Java ResourceBundle class.
    `--tcl´
    - + Tcl mode: input is a tcl/msgcat `.msg´ file.
    -

    8.2.2 Input file location

    +

    8.2.2 Input file location

    @@ -388,7 +388,7 @@ If no input file is given or if it is `-´, standar

    -

    8.2.3 Input file location in Java mode

    +

    8.2.3 Input file location in Java mode

    @@ -396,16 +396,16 @@ If no input file is given or if it is `-´, standar
    `--resource=resource´
    - + Specify the resource name.
    `-l locale´
    `--locale=locale´
    - + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC. @@ -418,7 +418,7 @@ separated with an underscore. The class is located using the CLASSPATH -

    8.2.4 Input file location in Tcl mode

    +

    8.2.4 Input file location in Tcl mode

    @@ -426,14 +426,14 @@ separated with an underscore. The class is located using the CLASSPATH
    `--locale=locale´
    - + Specify the locale name, either a language specification of the form ll or a combined language and country specification of the form ll_CC.
    `-d directory´
    - + Specify the base directory of `.msg´ message catalogs.
    @@ -445,7 +445,7 @@ located in the specified directory.

    -

    8.2.5 Output file location

    +

    8.2.5 Output file location

    @@ -453,8 +453,8 @@ located in the specified directory.
    `--output-file=file´
    - + Write output to specified file.
    @@ -466,26 +466,26 @@ or if it is `-´.

    -

    8.2.6 Output details

    +

    8.2.6 Output details

    `--force-po´
    - + Always write an output file even if it contains no message.
    `-i´
    `--indent´
    - + Write the .po file using indented style.
    `--strict´
    - + Write out a strict Uniforum conforming PO file. Note that this Uniforum format should be avoided because it doesn't support the GNU extensions. @@ -494,15 +494,15 @@ GNU extensions.
    `--width=number´
    - + Set the output page width. Long strings in the output files will be split across multiple lines in order to ensure that each line's width (= number of screen columns) is less or equal to the given number.
    `--no-wrap´
    - + Do not break long message lines. Message lines whose width exceeds the output page width will not be split into several lines. Only file reference lines which are wider than the output page width will be split. @@ -511,9 +511,9 @@ lines which are wider than the output page width will be split.
    `--sort-output´
    - + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -521,7 +521,7 @@ for the translator to understand each message's context. -

    8.2.7 Informative output

    +

    8.2.7 Informative output

    @@ -529,34 +529,34 @@ for the translator to understand each message's context.
    `--help´
    - + Display this help and exit.
    `-V´
    `--version´
    - + Output version information and exit.
    `-v´
    `--verbose´
    - + Increase verbosity level.
    -

    8.3 The Format of GNU MO Files

    +

    8.3 The Format of GNU MO Files

    - +

    @@ -565,7 +565,7 @@ which appears below.

    - + The first two words serve the identification of the file. The magic number will always signal GNU MO files. The number is stored in the byte order of the generating machine, so the magic number really is @@ -613,7 +613,7 @@ translated tables, making the system information very easy to find.

    - + The size S of the hash table can be zero. In this case, the hash table itself is not contained in the MO file. Some people might prefer this because a precomputed hashing table takes disk space, and @@ -634,7 +634,7 @@ machines, a correct alignment will speed things up.

    - + Plural forms are stored by letting the plural of the original string follow the singular of the original string, separated through a NUL byte. The length which appears in the string descriptor diff --git a/doc/gettext_9.html b/doc/gettext_9.html index 07d9a1ac6..5305cb1bc 100644 --- a/doc/gettext_9.html +++ b/doc/gettext_9.html @@ -1,7 +1,7 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - 9 The User's View @@ -10,7 +10,7 @@ Go to the first, previous<

    -

    9 The User's View

    +

    9 The User's View

    When GNU gettext will truly have reached its goal, average users @@ -43,11 +43,11 @@ for both installers and end users. -

    9.1 The Current `ABOUT-NLS´ Matrix

    +

    9.1 The Current `ABOUT-NLS´ Matrix

    - +

    @@ -57,7 +57,7 @@ may check the distribution for the `ABOUT-NLS´ information file, some `ll.po´ files, often kept together into some `po/´ directory, or for an `intl/´ directory. Internationalized packages have usually many `ll.po´ files, where ll represents -the language. section 9.3 Magic for End Users for a complete description of the format +the language. section 9.3 Magic for End Users for a complete description of the format for ll.

    @@ -75,10 +75,10 @@ Translation Project sites, and also on most GNU archive sites.

    -

    9.2 Magic for Installers

    +

    9.2 Magic for Installers

    - +

    @@ -97,7 +97,7 @@ produces programs totally unable to translate messages.

    - + Internationalized packages have usually many `ll.po´ files. Unless translations are disabled, all those available are installed together @@ -109,20 +109,20 @@ codes, stating which languages are allowed.

    -

    9.3 Magic for End Users

    +

    9.3 Magic for End Users

    - +

    - + We consider here those packages using GNU gettext internally, and for which the installers did not disable translation at configure time. Then, users only have to set the LANG environment variable to the appropriate `ll_CC´ -combination prior to using the programs in the package. See section 9.1 The Current `ABOUT-NLS´ Matrix. +combination prior to using the programs in the package. See section 9.1 The Current `ABOUT-NLS´ Matrix. For example, let's presume a German site. At the shell prompt, users merely have to execute `setenv LANG de_DE´ (in csh) or `export LANG; LANG=de_DE´ (in sh). They could even do diff --git a/doc/gettext_foot.html b/doc/gettext_foot.html index 0fb85ca1f..9a197ae7d 100644 --- a/doc/gettext_foot.html +++ b/doc/gettext_foot.html @@ -1,14 +1,14 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Footnotes -

    GNU gettext tools, version 0.11.4

    +

    GNU gettext tools, version 0.11.6-pre2

    Native Language Support Library and Tools

    -

    Edition 0.11.4, 23 July 2002

    +

    Edition 0.11.6-pre2, 30 October 2002

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -36,7 +36,7 @@ variables.

    Additions are welcome. Send appropriate information to bug-glibc-manual@gnu.org.

    -This document was generated on 24 July 2002 using the +This document was generated on 5 November 2002 using the texi2html translator version 1.52a.

    diff --git a/doc/gettext_toc.html b/doc/gettext_toc.html index a10b465b1..7d6337449 100644 --- a/doc/gettext_toc.html +++ b/doc/gettext_toc.html @@ -1,14 +1,14 @@ + from gettext.texi on 5 November 2002 --> GNU gettext utilities - Table of Contents -

    GNU gettext tools, version 0.11.4

    +

    GNU gettext tools, version 0.11.6-pre2

    Native Language Support Library and Tools

    -

    Edition 0.11.4, 23 July 2002

    +

    Edition 0.11.6-pre2, 30 October 2002

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -48,313 +48,315 @@
  • 4.1.1 Input file location
  • 4.1.2 Output file location
  • 4.1.3 Choice of input file language -
  • 4.1.4 Operation mode -
  • 4.1.5 Language=C/C++ specific options -
  • 4.1.6 Output details -
  • 4.1.7 Informative output +
  • 4.1.4 Input file interpretation +
  • 4.1.5 Operation mode +
  • 4.1.6 Language=C/C++ specific options +
  • 4.1.7 Output details +
  • 4.1.8 Informative output -
  • 5 Creating a New PO File +
  • 5 Creating a New PO File -
  • 6 Updating Existing PO Files +
  • 6 Updating Existing PO Files -
  • 7 Manipulating PO Files +
  • 7 Manipulating PO Files -
  • 8 Producing Binary MO Files +
  • 8 Producing Binary MO Files -
  • 9 The User's View +
  • 9 The User's View -
  • 10 The Programmer's View +
  • 10 The Programmer's View -
  • 11 The Translator's View +
  • 11 The Translator's View -
  • 12 The Maintainer's View +
  • 12 The Maintainer's View +
  • 14 Concluding Remarks + +
  • A Language Codes +
  • B Country Codes +
  • Program Index +
  • Option Index +
  • Variable Index +
  • PO Mode Index +
  • Autoconf Macro Index +
  • General Index

    -This document was generated on 24 July 2002 using the +This document was generated on 5 November 2002 using the texi2html translator version 1.52a.

    diff --git a/doc/version.texi b/doc/version.texi index a209705d0..0ac907b2c 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 23 July 2002 -@set UPDATED-MONTH July 2002 -@set EDITION 0.11.4 -@set VERSION 0.11.4 +@set UPDATED 30 October 2002 +@set UPDATED-MONTH October 2002 +@set EDITION 0.11.6-pre2 +@set VERSION 0.11.6-pre2 diff --git a/intl-java/Makefile.in b/intl-java/Makefile.in index 631967c36..4d4cb3ceb 100644 --- a/intl-java/Makefile.in +++ b/intl-java/Makefile.in @@ -114,7 +114,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -122,7 +121,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 32203a372..65e9d61aa 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -183,6 +181,7 @@ libgettextlib_la_SOURCES = \ pipe.h pipe-bidi.c pipe-in.c pipe-out.c \ progname.h progname.c \ safe-read.h safe-read.c \ + safe-write.h safe-write.c \ sh-quote.h sh-quote.c \ stpncpy.h stpncpy.c \ strtoul.c \ @@ -203,7 +202,6 @@ LIBADD_SOURCE = \ mkdtemp.h mkdtemp.c \ pfnmatch.h pfnmatch.c \ setenv.h setenv.c unsetenv.c \ - libstdarg.h \ stpcpy.h stpcpy.c \ strcase.h strcasecmp.c strncasecmp.c \ strcspn.c \ @@ -271,8 +269,8 @@ am_libgettextlib_la_OBJECTS = argmatch.lo backupfile.lo addext.lo \ getopt1.lo hash.lo javacomp.lo javaexec.lo linebreak.lo \ localcharset.lo mbswidth.lo obstack.lo concatpath.lo \ pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo safe-read.lo \ - sh-quote.lo stpncpy.lo strtoul.lo tmpdir.lo wait-process.lo \ - xerror.lo xmalloc.lo xstrdup.lo xsetenv.lo + safe-write.lo sh-quote.lo stpncpy.lo strtoul.lo tmpdir.lo \ + wait-process.lo xerror.lo xmalloc.lo xstrdup.lo xsetenv.lo libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ diff --git a/libasprintf/Makefile.in b/libasprintf/Makefile.in index 9fef35bc6..1d03e6fe2 100644 --- a/libasprintf/Makefile.in +++ b/libasprintf/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.7.2 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,80 +14,125 @@ @SET_MAKE@ -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ + + +# Documentation in Postscript format. +DVIPS = @DVIPS@ -D600 ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -OBJDUMP = @OBJDUMP@ +LTLIBOBJS = @LTLIBOBJS@ + +MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ -VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ - - -# Documentation in Postscript format. -DVIPS = @DVIPS@ -D600 # Documentation in Portable Document Format. TEXI2PDF = @TEXI2PDF@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I ../m4 @@ -121,8 +167,6 @@ psdir = $(docdir) pdfdir = $(docdir) htmldir = $(docdir) -MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ - info_TEXINFOS = autosprintf.texi CLEANFILES = autosprintf.pdf @@ -161,12 +205,9 @@ libasprintf_la_LIBADD = am_libasprintf_la_OBJECTS = lib-asprintf.lo autosprintf.lo libasprintf_la_OBJECTS = $(am_libasprintf_la_OBJECTS) -DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -174,7 +215,6 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ @@ -183,18 +223,19 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(libasprintf_la_SOURCES) +am__TEXINFO_TEX_DIR = $(srcdir) INFO_DEPS = autosprintf.info DVIS = autosprintf.dvi +PDFS = autosprintf.pdf +PSS = autosprintf.ps TEXINFOS = autosprintf.texi HEADERS = $(include_HEADERS) -DIST_COMMON = README $(include_HEADERS) ./stamp-h.in AUTHORS COPYING \ - COPYING.LIB ChangeLog INSTALL Makefile.am Makefile.in NEWS \ - aclocal.m4 config.guess config.h.in config.sub configure \ - configure.in install-sh ltmain.sh missing mkinstalldirs \ - texinfo.tex +DIST_COMMON = README $(include_HEADERS) AUTHORS COPYING COPYING.LIB \ + ChangeLog INSTALL Makefile.am Makefile.in NEWS aclocal.m4 \ + config.guess config.h.in config.sub configure configure.in \ + install-sh ltmain.sh missing mkinstalldirs texinfo.tex SOURCES = $(libasprintf_la_SOURCES) all: config.h @@ -203,73 +244,66 @@ all: config.h .SUFFIXES: .SUFFIXES: .pdf .c .cc .dvi .info .lo .o .obj .ps .texi -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in ../m4/backupfile.m4 ../m4/codeset.m4 ../m4/error.m4 ../m4/flex.m4 ../m4/fnmatch.m4 ../m4/gcj.m4 ../m4/getline.m4 ../m4/gettext.m4 ../m4/glibc21.m4 ../m4/hostname.m4 ../m4/iconv.m4 ../m4/intdiv0.m4 ../m4/intmax.m4 ../m4/inttypes-pri.m4 ../m4/inttypes.m4 ../m4/inttypes_h.m4 ../m4/isc-posix.m4 ../m4/javacomp.m4 ../m4/javaexec.m4 ../m4/lcmessage.m4 ../m4/lib-ld.m4 ../m4/lib-link.m4 ../m4/lib-prefix.m4 ../m4/libtool.m4 ../m4/longdouble.m4 ../m4/longlong.m4 ../m4/mbrtowc.m4 ../m4/mbstate_t.m4 ../m4/mbswidth.m4 ../m4/mkdtemp.m4 ../m4/progtest.m4 ../m4/setenv.m4 ../m4/setlocale.m4 ../m4/siginfo.m4 ../m4/signalblocking.m4 ../m4/signed.m4 ../m4/ssize_t.m4 ../m4/stdbool.m4 ../m4/stdint_h.m4 ../m4/tmpdir.m4 ../m4/uintmax_t.m4 ../m4/ulonglong.m4 ../m4/unionwait.m4 ../m4/wchar_t.m4 +$(ACLOCAL_M4): configure.in ../m4/backupfile.m4 ../m4/codeset.m4 ../m4/error.m4 ../m4/fixautomake.m4 ../m4/flex.m4 ../m4/fnmatch.m4 ../m4/gcj.m4 ../m4/getline.m4 ../m4/gettext.m4 ../m4/glibc21.m4 ../m4/hostname.m4 ../m4/iconv.m4 ../m4/intdiv0.m4 ../m4/intmax.m4 ../m4/inttypes-pri.m4 ../m4/inttypes.m4 ../m4/inttypes_h.m4 ../m4/isc-posix.m4 ../m4/javacomp.m4 ../m4/javaexec.m4 ../m4/lcmessage.m4 ../m4/lib-ld.m4 ../m4/lib-link.m4 ../m4/lib-prefix.m4 ../m4/libtool.m4 ../m4/longdouble.m4 ../m4/longlong.m4 ../m4/mbrtowc.m4 ../m4/mbstate_t.m4 ../m4/mbswidth.m4 ../m4/mkdtemp.m4 ../m4/progtest.m4 ../m4/setenv.m4 ../m4/setlocale.m4 ../m4/siginfo.m4 ../m4/signalblocking.m4 ../m4/signed.m4 ../m4/ssize_t.m4 ../m4/stdbool.m4 ../m4/stdint_h.m4 ../m4/tmpdir.m4 ../m4/uintmax_t.m4 ../m4/ulonglong.m4 ../m4/unionwait.m4 ../m4/wchar_t.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-hT stamp-h -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in + +config.h: stamp-h1 @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in + touch $(srcdir)/config.h.in distclean-hdr: - -rm -f config.h + -rm -f config.h stamp-h1 +libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" = "$$p" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libasprintf.la: $(libasprintf_la_OBJECTS) $(libasprintf_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libasprintf_la_LDFLAGS) $(libasprintf_la_OBJECTS) $(libasprintf_la_LIBADD) $(LIBS) @@ -280,96 +314,104 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: - $(COMPILE) -c `cygpath -w $<` + $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .c.lo: - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.o: - $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.obj: - $(CXXCOMPILE) -c -o $@ `cygpath -w $<` + $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .cc.lo: - $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +mostlyclean-libtool: + -rm -f *.lo -autosprintf.info: autosprintf.texi -autosprintf.dvi: autosprintf.texi +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool .texi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ - `echo $< | sed 's,.*/,,'` + @rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .texi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $< - -.texi: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ - `echo $< | sed 's,.*/,,'` + $(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< +autosprintf.info: autosprintf.texi +autosprintf.dvi: autosprintf.texi +autosprintf.pdf: autosprintf.texi TEXI2DVI = texi2dvi .dvi.ps: - $(DVIPS) $< -o $@ + $(DVIPS) -o $@ $< uninstall-info-am: $(PRE_UNINSTALL) @if (install-info --version && \ - install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ + install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \ done; \ else :; fi @$(NORMAL_UNINSTALL) @list='$(INFO_DEPS)'; \ for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ (if cd $(DESTDIR)$(infodir); then \ - echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ - rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ + echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9])"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \ else :; fi); \ done dist-info: $(INFO_DEPS) list='$(INFO_DEPS)'; \ for base in $$list; do \ - d=$(srcdir); \ - for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -f $$base; then d=.; else d=$(srcdir); fi; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done mostlyclean-aminfo: - -rm -f autosprintf.aux autosprintf.cp autosprintf.dvi autosprintf.fn \ - autosprintf.ky autosprintf.log autosprintf.pg autosprintf.ps \ - autosprintf.toc autosprintf.tp autosprintf.vr + -rm -f autosprintf.aux autosprintf.cp autosprintf.cps autosprintf.fn \ + autosprintf.fns autosprintf.ky autosprintf.kys \ + autosprintf.log autosprintf.pg autosprintf.pgs \ + autosprintf.tmp autosprintf.toc autosprintf.tp \ + autosprintf.tps autosprintf.vr autosprintf.vrs \ + autosprintf.dvi autosprintf.pdf autosprintf.ps maintainer-clean-aminfo: - cd $(srcdir) && \ - for i in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; for i in $$list; do \ rm -f $$i; \ if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ rm -f $$i-[0-9]*; \ fi; \ done +includeHEADERS_INSTALL = $(INSTALL_HEADER) install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) @list='$(include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ + $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ done uninstall-includeHEADERS: @@ -380,58 +422,96 @@ uninstall-includeHEADERS: rm -f $(DESTDIR)$(includedir)/$$f; \ done +ETAGS = etags +ETAGSFLAGS = + +CTAGS = ctags +CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -439,48 +519,77 @@ distdir: $(DISTFILES) fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="${top_distdir}" distdir="$(distdir)" \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-info -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distuninstallcheck: + cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h \ @@ -497,6 +606,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -506,7 +616,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -516,11 +626,8 @@ clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-am - -rm -f config.status config.cache config.log + -rm -f $(am__CONFIG_DISTCLEAN_FILES) distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags @@ -544,21 +651,23 @@ install-info-am: $(INFO_DEPS) $(mkinstalldirs) $(DESTDIR)$(infodir) @list='$(INFO_DEPS)'; \ for file in $$list; do \ - d=$(srcdir); \ - for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \ + if test -f $$ifile; then \ + relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ + echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ + $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ else : ; fi; \ done; \ done @$(POST_INSTALL) @if (install-info --version && \ - install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ + install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\ done; \ else : ; fi install-man: @@ -566,7 +675,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic @@ -575,21 +685,31 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: $(PDFS) + +ps: ps-am + +ps-am: $(PSS) + uninstall-am: uninstall-includeHEADERS uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-local -.PHONY: GTAGS all all-am all-local check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool dist dist-all dist-info \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec install-exec-am \ - install-includeHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ - mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool tags uninstall uninstall-am \ +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ + dist-all dist-gzip dist-info distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ + install-exec-am install-includeHEADERS install-info \ + install-info-am install-libLTLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic mostlyclean mostlyclean-aminfo \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ + pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-includeHEADERS uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-local diff --git a/libasprintf/aclocal.m4 b/libasprintf/aclocal.m4 index 8499c6307..95629cc77 100644 --- a/libasprintf/aclocal.m4 +++ b/libasprintf/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.5 +# generated automatically by aclocal 1.7.2 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,11 +11,30 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. +# Do all the work for Automake. -*- Autoconf -*- -# serial 5 +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -24,62 +43,62 @@ # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. -# The purpose of this macro is to provide the user with a means to -# check macros which are provided without letting her know how the -# information is coded. -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +AC_PREREQ([2.54]) - -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) -# ---------------------------------------------- +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi fi +AC_SUBST([CYGPATH_W]) # Define the identity of the package. -PACKAGE=$1 -AC_SUBST(PACKAGE)dnl -VERSION=$2 -AC_SUBST(VERSION)dnl -ifelse([$3],, +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -ifdef([m4_pattern_allow], - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl - -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. -AC_SUBST(EXEEXT) -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -AC_SUBST(OBJEXT) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -89,22 +108,125 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) ]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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 + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.7.2])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + # # Check to make sure that the build environment is sane. # +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # serial 3 # AM_SANITY_CHECK @@ -148,8 +270,27 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# -*- Autoconf -*- -# serial 2 + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -171,13 +312,29 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) # AM_AUX_DIR_EXPAND +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -216,19 +373,59 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -238,11 +435,35 @@ AC_SUBST(install_sh)]) # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) # serial 4 -*- Autoconf -*- +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be @@ -254,9 +475,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX" or "OBJC". +# NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -271,7 +492,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -319,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc], if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type=$depmode @@ -333,8 +554,10 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -352,7 +575,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -367,30 +590,48 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -# This macro should only be invoked once -- use via AC_REQUIRE. -# Usage: -# AM_OUTPUT_DEPENDENCY_COMMANDS +# Generate code to set up dependency tracking. -*- Autoconf -*- -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ -AC_OUTPUT_COMMANDS([ -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` @@ -414,14 +655,48 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done -], [AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir"])]) +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 2 # AM_MAKE_INCLUDE() # ----------------- @@ -434,7 +709,7 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -444,7 +719,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -454,7 +729,7 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi @@ -464,23 +739,35 @@ AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) -# serial 3 +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU 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. + +# serial 5 + +AC_PREREQ(2.52) # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. -# -# FIXME: Once using 2.50, use this: -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl -ifelse([$1], [FALSE], - [errprint(__file__:__line__: [$0: invalid condition: $1 -])dnl -m4exit(1)])dnl +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -489,72 +776,38 @@ if $2; then else $1_TRUE='#' $1_FALSE= -fi]) +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -# serial 3 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". - -AC_PREREQ([2.12]) - -AC_DEFUN([AM_CONFIG_HEADER], -[ifdef([AC_FOREACH],dnl - [ - dnl prepare to store our destination file list for use in config.status - AC_FOREACH([_AM_File], [$1], - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) - dnl and add it to the list of files AC keeps track of, along - dnl with our hook - AC_CONFIG_HEADERS(_AM_File, -dnl COMMANDS, [, INIT-CMDS] -[# update the timestamp -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h" -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS - m4_popdef([_AM_Dest])])],dnl -[AC_CONFIG_HEADER([$1]) - AC_OUTPUT_COMMANDS( - ifelse(patsubst([$1], [[^ ]], []), - [], - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl -[am_indx=1 -for am_file in $1; do - case " \$CONFIG_HEADERS " in - *" \$am_file "*) - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` - if test -n "\$am_dir"; then - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do - am_tmpdir=\$am_tmpdir\$am_subdir/ - if test ! -d \$am_tmpdir; then - mkdir \$am_tmpdir - fi - done - fi - echo timestamp > "\$am_dir"stamp-h\$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` -done]) -])]) # AM_CONFIG_HEADER +# 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, or (at your option) +# any later version. -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(m4_regexp([$1], [^/.*]), -1, - [.], - m4_patsubst([$1], [^\(/\).*], [\1])), - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -]) # _AM_DIRNAME +# 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. + +AC_PREREQ([2.52]) + +# serial 6 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- @@ -4400,3 +4653,31 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H], fi ]) +# fixautomake.m4 serial 1 (gettext-0.11.6) +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 + +dnl Fix unesthetic build commands generated by automake. +AC_DEFUN([FIX_MAKEFILE_COMPILE], [ + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $1 > $1.tmp + mv $1.tmp $1 +]) + +dnl Fix an automake-1.5-1.7.2 bug: the distrib rule is omitted. +AC_DEFUN([FIX_MAKEFILE_DISTRIB], [ + sed -e 's,^#distdir:,distdir:,' < $1 > $1.tmp + mv $1.tmp $1 +]) + +dnl Fix an automake-1-5.1.7.2 bug: all info files are erased by "make". +AC_DEFUN([FIX_MAKEFILE_INFO], [ + sed -e '/@rm -f \$''@/d' < $1 > $1.tmp + mv $1.tmp $1 +]) + diff --git a/libasprintf/config.h.in b/libasprintf/config.h.in index 0d59fc279..74c359576 100644 --- a/libasprintf/config.h.in +++ b/libasprintf/config.h.in @@ -1,26 +1,27 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated from configure.in by autoheader. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ #undef CRAY_STACKSEG_END -/* Define if using `alloca.c'. */ +/* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Define if you have `alloca', as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ #undef HAVE_ALLOCA_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define if you have the 'intmax_t' type in or . */ #undef HAVE_INTMAX_T -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define if exists, doesn't clash with , and @@ -33,41 +34,41 @@ /* Define if you have the 'long long' type. */ #undef HAVE_LONG_LONG -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if the system has the type `ptrdiff_t'. */ +/* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T -/* Define if you have the `snprintf' function. */ +/* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define if exists, doesn't clash with , and declares uintmax_t. */ #undef HAVE_STDINT_H_WITH_UINTMAX -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the `vasprintf' function. */ +/* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF /* Define if you have the 'wchar_t' type. */ @@ -76,6 +77,21 @@ /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. @@ -84,7 +100,7 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ diff --git a/libasprintf/configure b/libasprintf/configure index fbf3cfd02..63054cf48 100755 --- a/libasprintf/configure +++ b/libasprintf/configure @@ -1,11 +1,244 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.57. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -18,6 +251,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -163,81 +397,7 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# 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" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +410,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,6 +422,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="vasprintf.c" # Factoring default headers for most tests. ac_includes_default="\ @@ -298,6 +467,9 @@ 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL ALLOCA DVIPS TEXI2PDF PERL LIBOBJS LTLIBOBJS' +ac_subst_files='' + # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -336,13 +508,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -475,7 +640,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -654,7 +819,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -666,18 +831,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -693,13 +859,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -709,13 +885,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -764,7 +943,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -904,31 +1103,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -947,51 +1146,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. -done - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -1005,21 +1249,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1032,6 +1308,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -1043,9 +1346,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1046: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1054,7 +1357,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1057: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1062,7 +1365,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1065: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1078,42 +1381,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1081: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1085: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1091: 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:1093: 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:1095: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1114: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1116: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1124,27 +1427,26 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1136: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1139: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + + +am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1162,7 +1464,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1165: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1182,43 +1484,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1185: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1231,7 +1538,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1234: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1242,7 +1549,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1245: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1266,7 +1573,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1269: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1279,13 +1586,13 @@ then # Ok. : else - { { echo "$as_me:1282: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1288: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1300,8 +1607,9 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +am_aux_dir=`cd $ac_aux_dir && pwd` test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL @@ -1309,16 +1617,15 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - am_backtick='`' - { echo "$as_me:1313: WARNING: ${am_backtick}missing' script is too old or missing" >&5 -echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1321: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1326,41 +1633,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1336: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1344: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1347: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1354: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1371,96 +1681,163 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1374: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1378: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - -# test to see if srcdir already configured -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + # test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1414: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + # Define the identity of the package. -PACKAGE=libasprintf -VERSION=1.0 + PACKAGE=libasprintf + VERSION=1.0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. +# Some tools Automake needs. -# Autoconf 2.50 always computes EXEEXT. However we need to be -# compatible with 2.13, for now. So we always define EXEEXT, but we -# don't compute it. +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} -# Similar for OBJEXT -- only we only use OBJEXT if the user actually -# requests that it be used. This is a bit dumb. -: ${OBJEXT=o} -# Some tools Automake needs. +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + STRIP=$ac_ct_STRIP +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. - ac_config_headers="$ac_config_headers config.h" + + + ac_config_headers="$ac_config_headers config.h" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1470,7 +1847,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1473: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1478,25 +1855,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1488: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1496: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1499: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1505,7 +1885,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1508: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1513,25 +1893,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1523: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1531: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1534: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1544,7 +1927,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1547: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1552,25 +1935,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1562: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1570: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1573: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1579,7 +1965,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1582: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1587,25 +1973,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1597: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1605: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1608: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1618,7 +2007,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1621: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1627,19 +2016,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1641: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1651,19 +2043,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1663: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1666: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1674,7 +2064,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1677: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1682,25 +2072,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1692: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1700: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1703: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1713,7 +2106,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1716: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1721,25 +2114,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1731: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1739: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1742: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1751,33 +2147,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1754: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1759:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1762: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1765: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1767: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1770: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1772: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1775: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1779 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1788,100 +2191,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1795: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1798: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1801: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1824: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1830: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1835: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1841: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1844: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1851: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1859: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1866: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1868: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1871: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1873: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1876: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1889,26 +2312,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1892: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1898: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1904: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1910 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1919,40 +2348,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1925: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1937: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1944: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1948: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1954 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1966,41 +2402,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1969: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1972: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1975: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1978: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1990: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1996: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2002 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2011,26 +2452,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2017: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2020: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2023: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2033: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2047,6 +2489,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2057,16 +2595,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2060: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2063: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2066: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2069: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2078,8 +2616,12 @@ if { (eval echo "$as_me:2060: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2081 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2091,27 +2633,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2097: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2100: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2103: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2113 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2122,21 +2669,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2125: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2128: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2131: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2134: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2149,7 +2697,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2157,8 +2706,19 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null + + + ac_config_commands="$ac_config_commands depfiles" -ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2166,9 +2726,9 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:2169: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include='#' +am__include="#" am__quote= _am_result=none # First try GNU make style include. @@ -2178,7 +2738,7 @@ echo "include confinc" > confmf # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -2188,18 +2748,41 @@ if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then am__include=.include - am__quote='"' + am__quote="\"" _am_result=BSD fi fi -echo "$as_me:2196: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + + depcc="$CC" am_compiler_list= -echo "$as_me:2202: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2246,7 +2829,7 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CC_dependencies_compiler_type=$depmode @@ -2261,9 +2844,22 @@ else fi fi -echo "$as_me:2264: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -2275,7 +2871,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:2278: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2283,25 +2879,28 @@ else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:2293: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:2301: result: $CXX" >&5 + echo "$as_me:$LINENO: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:2304: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2314,7 +2913,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2317: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2322,25 +2921,28 @@ else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:2332: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:2340: result: $ac_ct_CXX" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:2343: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2351,34 +2953,39 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" CXX=$ac_ct_CXX fi + # Provide some information about the compiler. -echo "$as_me:2355:" \ +echo "$as_me:$LINENO:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:2358: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:2361: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2363: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:2366: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:2368: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:2371: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:2374: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2380 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2392,41 +2999,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2395: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2398: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2401: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2404: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2416: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:2422: checking whether $CXX accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2428 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2437,26 +3049,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2440: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2443: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2446: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2449: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2459: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -2483,8 +3096,12 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2486 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2496,27 +3113,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2499: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2502: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2505: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2508: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2518 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2527,21 +3149,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2533: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2536: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2539: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2560,7 +3183,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:2563: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2607,7 +3230,7 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then am_cv_CXX_dependencies_compiler_type=$depmode @@ -2622,9 +3245,22 @@ else fi fi -echo "$as_me:2625: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type" +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2638,43 +3274,48 @@ CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type" # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2641: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -2687,7 +3328,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2690: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2698,13 +3339,14 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2703: error: cannot run $ac_config_sub" >&5 + { { 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:2707: checking build system type" >&5 +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 @@ -2713,23 +3355,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2716: error: cannot guess build type; you must specify one" >&5 + { { 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:2720: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2725: result: $ac_cv_build" >&5 +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:2732: checking host system type" >&5 + +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 @@ -2738,18 +3381,24 @@ else 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:2741: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2746: result: $ac_cv_host" >&5 +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 --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -2827,6 +3476,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -2837,7 +3487,7 @@ fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:2840: checking for ld used by GCC" >&5 + 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*) @@ -2867,10 +3517,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2870: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2873: checking for non-GNU ld" >&5 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -2900,16 +3550,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2903: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2906: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2909: error: no acceptable ld found in \$PATH" >&5 +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:2912: checking if the linker ($LD) is GNU ld" >&5 +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 "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2921,23 +3571,24 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:2924: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:2928: checking for $LD option to reload object files" >&5 + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:2935: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:2940: checking for BSD-compatible nm" >&5 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2973,10 +3624,10 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:2976: result: $NM" >&5 +echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:2979: checking for a sed that does not truncate output" >&5 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3058,21 +3709,21 @@ if test "X$SED" != "X"; then else SED=$lt_cv_path_SED fi -echo "$as_me:3061: result: $SED" >&5 +echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 -echo "$as_me:3064: checking whether ln -s works" >&5 +echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3068: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3071: result: no, using $LN_S" >&5 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3075: checking how to recognise dependent libraries" >&5 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3253,13 +3904,18 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac fi -echo "$as_me:3256: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:3262: checking command to parse $NM output" >&5 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3343,17 +3999,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:3346: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3349: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:3353: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:3356: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -3405,10 +4061,10 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:3408: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3411: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -3449,10 +4105,10 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:3452: result: failed" >&5 + echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:3455: result: ok" >&5 + echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi @@ -3461,7 +4117,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3464: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -3479,21 +4135,31 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 3485 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if { (eval echo "$as_me:3490: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3496: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3507,7 +4173,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -3516,17 +4183,21 @@ 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 3519 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:3523: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3529: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3541,7 +4212,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -3563,28 +4235,38 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:3566: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 3576 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF -if { (eval echo "$as_me:3581: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3587: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3598,7 +4280,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -3607,17 +4290,21 @@ 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 3610 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:3614: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3620: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3632,7 +4319,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -3645,8 +4333,10 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:3648: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -3656,26 +4346,313 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_header in dlfcn.h + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +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. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3662: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3668 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3672: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3678: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3686,29 +4663,80 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3697: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:3711: checking for ${ac_tool_prefix}file" >&5 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3763,16 +4791,16 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3766: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3769: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:3775: checking for file" >&5 + echo "$as_me:$LINENO: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3827,10 +4855,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3830: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3833: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3846,7 +4874,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3849: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3854,25 +4882,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3864: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3872: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3875: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3881,7 +4912,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3884: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3889,15 +4920,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3899: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -3905,10 +4939,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3908: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3911: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3920,7 +4954,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:3923: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3928,25 +4962,28 @@ else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:3938: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:3946: result: $STRIP" >&5 + echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:3949: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3955,7 +4992,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:3958: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3963,15 +5000,18 @@ else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:3973: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" @@ -3979,10 +5019,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:3982: result: $ac_ct_STRIP" >&5 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:3985: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3991,8 +5031,9 @@ else STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no -enable_win32_dll=yes +enable_win32_dll=no # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then @@ -4006,11 +5047,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4009 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5 + echo '#line 5050 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4013: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -4031,12 +5072,13 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:4034: checking whether the C compiler needs -belf" >&5 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4044,8 +5086,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 4047 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4056,21 +5102,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4059: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4062: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4065: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4068: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4081,7 +5128,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:4084: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -4089,324 +5136,6 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 fi ;; -*-*-cygwin* | *-*-mingw* | *-*-pw32*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:4096: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -echo "$as_me:4111: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - echo "$as_me:4119: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 -else - echo "$as_me:4122: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -echo "$as_me:4131: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_DLLTOOL="dlltool" -echo "$as_me:4146: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:4155: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 -else - echo "$as_me:4158: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - DLLTOOL=$ac_ct_DLLTOOL -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:4170: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AS="${ac_tool_prefix}as" -echo "$as_me:4185: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - echo "$as_me:4193: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 -else - echo "$as_me:4196: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -echo "$as_me:4205: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_AS="as" -echo "$as_me:4220: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - echo "$as_me:4229: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 -else - echo "$as_me:4232: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - AS=$ac_ct_AS -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:4244: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -echo "$as_me:4259: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - echo "$as_me:4267: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 -else - echo "$as_me:4270: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -echo "$as_me:4279: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_OBJDUMP="objdump" -echo "$as_me:4294: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:4303: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 -else - echo "$as_me:4306: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - OBJDUMP=$ac_ct_OBJDUMP -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - echo "$as_me:4317: checking if libtool should supply DllMain function" >&5 -echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6 -if test "${lt_cv_need_dllmain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4323 "configure" -#include "confdefs.h" - -int -main () -{ -extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4336: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4339: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4342: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4345: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_need_dllmain=no -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_need_dllmain=yes -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:4355: result: $lt_cv_need_dllmain" >&5 -echo "${ECHO_T}$lt_cv_need_dllmain" >&6 - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - echo "$as_me:4364: checking how to link DLLs" >&5 -echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6 -if test "${lt_cv_cc_dll_switch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4370 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4382: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4385: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4388: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4391: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - lt_cv_cc_dll_switch=-mdll -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -lt_cv_cc_dll_switch=-dll -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:4401: result: $lt_cv_cc_dll_switch" >&5 -echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6 - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; esac @@ -4500,7 +5229,7 @@ fi set dummy $CC compiler="$2" -echo "$as_me:4503: checking for objdir" >&5 +echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -4511,9 +5240,11 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:4514: result: $objdir" >&5 +echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" @@ -4526,7 +5257,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:4529: checking for $compiler option to produce PIC" >&5 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4682,14 +5413,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:4685: result: none" >&5 + echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:4688: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:4692: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4697,8 +5428,12 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 4700 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4709,16 +5444,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4712: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4715: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4718: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4721: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -4738,7 +5473,8 @@ if { (eval echo "$as_me:4712: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no fi @@ -4747,6 +5483,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no @@ -4754,23 +5491,23 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:4757: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:4763: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:4767: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:4773: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4779,8 +5516,12 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 4782 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4791,30 +5532,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4794: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4797: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4800: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4803: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:4817: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -4824,8 +5567,9 @@ link_static_flag="$lt_cv_prog_cc_static" no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:4828: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4845,7 +5589,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -4869,12 +5613,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:4872: result: $compiler_c_o" >&5 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:4877: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4886,8 +5630,12 @@ else save_objext="$ac_objext" ac_objext=lo cat >conftest.$ac_ext <<_ACEOF -#line 4889 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4898,16 +5646,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4904: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4907: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4910: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4919,7 +5667,8 @@ if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" @@ -4928,7 +5677,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:4931: result: $compiler_o_lo" >&5 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no @@ -4938,7 +5687,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:4941: checking if we can lock with hard links" >&5 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -4946,10 +5695,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:4949: result: $hard_links" >&5 + echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:4952: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -4959,15 +5708,19 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:4962: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 4969 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4978,16 +5731,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4981: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4984: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4987: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4990: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4999,11 +5752,12 @@ if { (eval echo "$as_me:4981: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:5006: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -5014,7 +5768,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:5017: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -5709,12 +6463,12 @@ EOF ;; esac fi -echo "$as_me:5712: result: $ld_shlibs" >&5 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:5717: checking how to hardcode library paths into programs" >&5 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -5738,20 +6492,20 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:5741: result: $hardcode_action" >&5 +echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo "$as_me:5746: checking whether stripping libraries is possible" >&5 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:5751: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:5754: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5759,7 +6513,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics -echo "$as_me:5762: checking dynamic linker characteristics" >&5 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -6178,17 +6932,17 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:6181: result: $dynamic_linker" >&5 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:6186: checking if libtool supports shared libraries" >&5 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:6188: result: $can_build_shared" >&5 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:6191: checking whether to build shared libraries" >&5 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 test "$can_build_shared" = "no" && enable_shared=no @@ -6209,14 +6963,14 @@ aix4*) fi ;; esac -echo "$as_me:6212: result: $enable_shared" >&5 +echo "$as_me:$LINENO: result: $enable_shared" >&5 echo "${ECHO_T}$enable_shared" >&6 -echo "$as_me:6215: checking whether to build static libraries" >&5 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:6219: result: $enable_static" >&5 +echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then @@ -6254,68 +7008,82 @@ else ;; *) - echo "$as_me:6257: checking for shl_load" >&5 + echo "$as_me:$LINENO: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6263 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -f = shl_load; +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != shl_load; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6294: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6297: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6300: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6303: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6313: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:6318: checking for shl_load in -ldld" >&5 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6323,8 +7091,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6326 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6342,93 +7114,108 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6348: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6351: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6354: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6365: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:6370: checking for dlopen" >&5 + echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6376 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -f = dlopen; +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != dlopen; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6407: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6410: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6413: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6416: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6426: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:6431: checking for dlopen in -ldl" >&5 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6436,8 +7223,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6439 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6455,32 +7246,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6458: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6461: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6464: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6467: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6478: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:6483: checking for dlopen in -lsvld" >&5 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6488,8 +7280,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6491 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6507,32 +7303,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6510: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6513: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6516: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6519: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6530: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:6535: checking for dld_link in -ldld" >&5 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6540,8 +7337,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6543 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -6559,40 +7360,46 @@ dld_link (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6562: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6565: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6568: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6571: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6582: result: $ac_cv_lib_dld_dld_link" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + fi + fi + fi + fi + fi ;; @@ -6615,7 +7422,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:6618: checking whether a program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6626,7 +7433,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6693: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -6706,13 +7513,14 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:6710: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:6715: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6723,7 +7531,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6790: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -6803,8 +7611,9 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:6807: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -6825,6 +7634,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -6834,7 +7644,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:6837: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6842,10 +7652,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:6845: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6848: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -6859,10 +7669,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:6862: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:6865: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -6877,7 +7687,7 @@ else fi - echo "$as_me:6880: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -7437,6 +8247,10 @@ EOF chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -7445,105 +8259,22 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion -echo "$as_me:7448: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 7456 "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:7505: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7508: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7511: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7514: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC -fi -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:7531: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:7534: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac -echo "$as_me:7539: checking for an ANSI C-conforming const" >&5 + +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 -#line 7545 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -7600,275 +8331,101 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7603: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7606: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7609: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7612: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_const=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:7622: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\EOF -#define const -EOF - -fi - - echo "$as_me:7632: checking for signed" >&5 -echo $ECHO_N "checking for signed... $ECHO_C" >&6 -if test "${bh_cv_c_signed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7638 "configure" -#include "confdefs.h" - -int -main () -{ -signed char x; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7650: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7653: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7656: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7659: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - bh_cv_c_signed=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -bh_cv_c_signed=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:7669: result: $bh_cv_c_signed" >&5 -echo "${ECHO_T}$bh_cv_c_signed" >&6 - if test $bh_cv_c_signed = no; then - -cat >>confdefs.h <<\EOF -#define signed -EOF - - fi - -echo "$as_me:7679: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7685 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:7693: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7699: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err 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 7721 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -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 7739 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 7760 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:7786: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:7789: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7791: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7794: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_c_const=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_c_const=no fi +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7807: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF +cat >>confdefs.h <<\_ACEOF +#define const +_ACEOF fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7823: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for signed" >&5 +echo $ECHO_N "checking for signed... $ECHO_C" >&6 +if test "${bh_cv_c_signed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7829 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +signed char x; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7835: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7838: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7841: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7844: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + bh_cv_c_signed=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + +bh_cv_c_signed=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7854: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$bh_cv_c_signed" >&6 + if test $bh_cv_c_signed = no; then -fi -done +cat >>confdefs.h <<\_ACEOF +#define signed +_ACEOF + + fi -echo "$as_me:7864: checking for size_t" >&5 +echo "$as_me:$LINENO: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7870 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -7882,38 +8439,40 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7888: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7891: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7894: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7904: result: $ac_cv_type_size_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define size_t unsigned -EOF +_ACEOF fi - echo "$as_me:7916: checking for long long" >&5 + + echo "$as_me:$LINENO: checking for long long" >&5 echo $ECHO_N "checking for long long... $ECHO_C" >&6 if test "${gt_cv_c_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7922,8 +8481,12 @@ else gt_cv_c_long_long=yes else cat >conftest.$ac_ext <<_ACEOF -#line 7925 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ long long foo = 0LL; int array [2*(sizeof(long long) >= sizeof(long)) - 1]; @@ -7936,37 +8499,39 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7942: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7945: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7948: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_c_long_long=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_c_long_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:7959: result: $gt_cv_c_long_long" >&5 +echo "$as_me:$LINENO: result: $gt_cv_c_long_long" >&5 echo "${ECHO_T}$gt_cv_c_long_long" >&6 if test $gt_cv_c_long_long = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LONG_LONG 1 -EOF +_ACEOF fi - echo "$as_me:7969: checking for long double" >&5 + + echo "$as_me:$LINENO: checking for long double" >&5 echo $ECHO_N "checking for long double... $ECHO_C" >&6 if test "${gt_cv_c_long_double+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7975,8 +8540,12 @@ else gt_cv_c_long_double=yes else cat >conftest.$ac_ext <<_ACEOF -#line 7978 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* The Stardent Vistra knows sizeof(long double), but does not support it. */ long double foo = 0.0; @@ -7992,44 +8561,50 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7995: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7998: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8001: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8004: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_c_long_double=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_c_long_double=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:8015: result: $gt_cv_c_long_double" >&5 +echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5 echo "${ECHO_T}$gt_cv_c_long_double" >&6 if test $gt_cv_c_long_double = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LONG_DOUBLE 1 -EOF +_ACEOF fi - echo "$as_me:8025: checking for wchar_t" >&5 + + echo "$as_me:$LINENO: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${gt_cv_c_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8031 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include wchar_t foo = (wchar_t)'\0'; int @@ -8041,43 +8616,48 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8044: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8047: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8050: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8053: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_c_wchar_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_c_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8063: result: $gt_cv_c_wchar_t" >&5 +echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 echo "${ECHO_T}$gt_cv_c_wchar_t" >&6 if test $gt_cv_c_wchar_t = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_WCHAR_T 1 -EOF +_ACEOF fi -echo "$as_me:8073: checking for ptrdiff_t" >&5 +echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 if test "${ac_cv_type_ptrdiff_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8079 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -8091,43 +8671,50 @@ if (sizeof (ptrdiff_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8097: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8100: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8103: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ptrdiff_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_ptrdiff_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8113: result: $ac_cv_type_ptrdiff_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 if test $ac_cv_type_ptrdiff_t = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_PTRDIFF_T 1 -EOF +_ACEOF + fi - echo "$as_me:8123: checking for inttypes.h" >&5 + + echo "$as_me:$LINENO: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8129 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -8139,43 +8726,49 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8142: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8145: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8148: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8151: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_inttypes_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8161: result: $jm_ac_cv_header_inttypes_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 if test $jm_ac_cv_header_inttypes_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_INTTYPES_H_WITH_UINTMAX 1 -EOF +_ACEOF fi - echo "$as_me:8171: checking for stdint.h" >&5 + + echo "$as_me:$LINENO: checking for stdint.h" >&5 echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 if test "${jm_ac_cv_header_stdint_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8177 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include int @@ -8187,43 +8780,51 @@ uintmax_t i = (uintmax_t) -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8190: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8193: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8196: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8199: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then jm_ac_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + jm_ac_cv_header_stdint_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8209: result: $jm_ac_cv_header_stdint_h" >&5 +echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 if test $jm_ac_cv_header_stdint_h = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_STDINT_H_WITH_UINTMAX 1 -EOF +_ACEOF fi - echo "$as_me:8219: checking for intmax_t" >&5 + + + + echo "$as_me:$LINENO: checking for intmax_t" >&5 echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 if test "${gt_cv_c_intmax_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8225 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -8243,45 +8844,51 @@ intmax_t x = -1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8246: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8249: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8252: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8255: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then gt_cv_c_intmax_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_c_intmax_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8265: result: $gt_cv_c_intmax_t" >&5 +echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 echo "${ECHO_T}$gt_cv_c_intmax_t" >&6 if test $gt_cv_c_intmax_t = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_INTMAX_T 1 -EOF +_ACEOF fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:8277: checking for working alloca.h" >&5 +echo "$as_me:$LINENO: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8283 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include int main () @@ -8292,43 +8899,48 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8298: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8301: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8304: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8314: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA_H 1 -EOF +_ACEOF fi -echo "$as_me:8324: checking for alloca" >&5 +echo "$as_me:$LINENO: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8330 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -8359,33 +8971,34 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8362: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8365: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8368: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8371: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8381: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA 1 -EOF +_ACEOF else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -8395,18 +9008,23 @@ else ALLOCA=alloca.$ac_objext -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 -EOF +_ACEOF -echo "$as_me:8402: checking whether \`alloca.c' needs Cray hooks" >&5 + +echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8408 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if defined(CRAY) && ! defined(CRAY2) webecray #else @@ -8415,7 +9033,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -8423,74 +9041,88 @@ fi rm -f conftest* fi -echo "$as_me:8426: result: $ac_cv_os_cray" >&5 +echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8431: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8437 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8471: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8474: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8477: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8487: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF break fi @@ -8498,7 +9130,7 @@ fi done fi -echo "$as_me:8501: checking stack direction for C alloca" >&5 +echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8507,8 +9139,12 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 8510 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int find_stack_direction () { @@ -8530,108 +9166,128 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8533: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8536: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8538: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8541: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:8553: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi + + for ac_func in snprintf vasprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8565: checking for $ac_func" >&5 +echo "$as_me:$LINENO: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8571 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + 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 /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8602: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8605: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8608: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8611: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8621: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + ac_aux_dir_abs=`cd $ac_aux_dir && pwd` # Extract the first word of "dvips", so it can be a program name with args. set dummy dvips; ac_word=$2 -echo "$as_me:8634: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DVIPS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8641,16 +9297,18 @@ else ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_DVIPS="$ac_dir/$ac_word" - echo "$as_me:8651: found $ac_dir/$ac_word" >&5 - break -fi + 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_DVIPS="$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_DVIPS" && ac_cv_path_DVIPS="$ac_aux_dir_abs/missing dvips" @@ -8660,16 +9318,16 @@ fi DVIPS=$ac_cv_path_DVIPS if test -n "$DVIPS"; then - echo "$as_me:8663: result: $DVIPS" >&5 + echo "$as_me:$LINENO: result: $DVIPS" >&5 echo "${ECHO_T}$DVIPS" >&6 else - echo "$as_me:8666: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "texi2pdf", so it can be a program name with args. set dummy texi2pdf; ac_word=$2 -echo "$as_me:8672: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEXI2PDF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8679,16 +9337,18 @@ else ac_cv_path_TEXI2PDF="$TEXI2PDF" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_TEXI2PDF="$ac_dir/$ac_word" - echo "$as_me:8689: found $ac_dir/$ac_word" >&5 - break -fi + 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_TEXI2PDF="$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_TEXI2PDF" && ac_cv_path_TEXI2PDF="$ac_aux_dir_abs/missing texi2pdf" @@ -8698,16 +9358,16 @@ fi TEXI2PDF=$ac_cv_path_TEXI2PDF if test -n "$TEXI2PDF"; then - echo "$as_me:8701: result: $TEXI2PDF" >&5 + echo "$as_me:$LINENO: result: $TEXI2PDF" >&5 echo "${ECHO_T}$TEXI2PDF" >&6 else - echo "$as_me:8704: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:8710: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8717,16 +9377,18 @@ else ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PERL="$ac_dir/$ac_word" - echo "$as_me:8727: found $ac_dir/$ac_word" >&5 - break -fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="$ac_aux_dir_abs/missing perl" @@ -8736,15 +9398,17 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:8739: result: $PERL" >&5 + echo "$as_me:$LINENO: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:8742: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -ac_config_files="$ac_config_files Makefile" -ac_config_commands="$ac_config_commands default" + + ac_config_files="$ac_config_files Makefile" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8755,7 +9419,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -8790,7 +9454,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -8821,35 +9485,248 @@ fi DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:8827: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. -debug=false -SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -_ACEOF + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac -cat >>$CONFIG_STATUS <<\_ACEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -8875,24 +9752,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -8901,10 +9774,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.57. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -8924,7 +9821,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -8934,6 +9831,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -8951,12 +9849,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -8965,9 +9863,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -8977,30 +9875,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:9003: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -9010,16 +9908,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:9022: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -9031,44 +9932,42 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # -AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + +_ACEOF -EOF -cat >>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:9071: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -9084,6 +9983,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -9092,23 +9994,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -9121,6 +10023,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -9136,27 +10044,20 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t @@ -9164,25 +10065,33 @@ s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@DEPDIR@,$DEPDIR,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@DEPDIR@,$DEPDIR,;t t s,@am__include@,$am__include,;t t s,@am__quote@,$am__quote,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t s,@CXXDEPMODE@,$CXXDEPMODE,;t t +s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t @@ -9195,25 +10104,20 @@ s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@ALLOCA@,$ALLOCA,;t t s,@DVIPS@,$DVIPS,;t t s,@TEXI2PDF@,$TEXI2PDF,;t t s,@PERL@,$PERL,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -9252,8 +10156,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -9267,7 +10171,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -9278,60 +10183,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:9326: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -9341,7 +10270,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:9344: error: cannot find input file: $f" >&5 + 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;; @@ -9354,23 +10283,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:9357: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -9381,9 +10316,24 @@ s,@INSTALL@,$ac_INSTALL,;t t rm -f $tmp/out fi + # Run the commands associated with the file. + case $ac_file in + Makefile ) + sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < Makefile > Makefile.tmp + mv Makefile.tmp Makefile + + + sed -e 's,^#distdir:,distdir:,' < Makefile > Makefile.tmp + mv Makefile.tmp Makefile + + + sed -e '/@rm -f \$''@/d' < Makefile > Makefile.tmp + mv Makefile.tmp Makefile + ;; + esac done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. @@ -9415,7 +10365,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:9418: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -9426,7 +10376,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:9429: error: cannot find input file: $f" >&5 + 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;; @@ -9439,7 +10389,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:9442: error: cannot find input file: $f" >&5 + { { 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;; @@ -9448,7 +10398,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -EOF +_ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -9464,16 +10414,16 @@ rm -f conftest.defines conftest.undefs # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF +cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${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 : end -EOF +_ACEOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. @@ -9484,14 +10434,14 @@ rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # 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 <<\EOF +cat >>conftest.undefs <<\_ACEOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF +_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 egrep "^[ ]*#[ ]*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 @@ -9515,7 +10465,7 @@ do mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -9543,23 +10493,24 @@ do done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ + # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:9559: $ac_file is unchanged" >&5 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -9570,24 +10521,31 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + { 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; }; }; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -9595,15 +10553,22 @@ done; } cat $tmp/config.h rm -f $tmp/config.h fi - # Run the commands associated with the file. - case $ac_file in - config.h ) # update the timestamp -echo timestamp >"./stamp-h" - ;; - esac +_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -9611,16 +10576,79 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - default-1 ) -test x"$AMDEP_TRUE" != x"" || -for mf in $CONFIG_FILES; do - case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. @@ -9645,38 +10673,60 @@ for mf in $CONFIG_FILES; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + 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 $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done - ;; - default ) - for m in Makefile; do - sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp - mv $m.tmp $m - done - for m in Makefile; do - sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp - mv $m.tmp $m - done - for m in Makefile; do - sed -e '/cd \$(srcdir) && rm -f /d' < $m > $m.tmp - mv $m.tmp $m - done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -9687,8 +10737,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/libuniname/Makefile.in b/libuniname/Makefile.in index b00af9b20..23736f098 100644 --- a/libuniname/Makefile.in +++ b/libuniname/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/m4/Makefile.in b/m4/Makefile.in index 0f8e57afe..e44c67c65 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -153,7 +151,7 @@ aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \ # |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' EXTRA_DIST = README \ -backupfile.m4 c-bs-a.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 gcj.m4 \ +backupfile.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 gcj.m4 \ getline.m4 gettext.m4 glibc21.m4 hostname.m4 iconv.m4 intdiv0.m4 intmax.m4 \ inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 javacomp.m4 \ javaexec.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 libtool.m4 \ diff --git a/man/Makefile.in b/man/Makefile.in index b1c2a99c9..cc43f50fd 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -114,7 +114,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -122,7 +121,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/man/autopoint.1 b/man/autopoint.1 index f74019171..dfeeadf96 100644 --- a/man/autopoint.1 +++ b/man/autopoint.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH AUTOPOINT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH AUTOPOINT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME autopoint \- copies standard gettext infrastructure .SH SYNOPSIS diff --git a/man/bind_textdomain_codeset.3 b/man/bind_textdomain_codeset.3 index bbc576e59..9bfbba722 100644 --- a/man/bind_textdomain_codeset.3 +++ b/man/bind_textdomain_codeset.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.4" +.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.6-pre2" .SH NAME bind_textdomain_codeset \- set encoding of message translations .SH SYNOPSIS diff --git a/man/bindtextdomain.3 b/man/bindtextdomain.3 index 4fc7eb7d6..8e87709df 100644 --- a/man/bindtextdomain.3 +++ b/man/bindtextdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.4" +.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.6-pre2" .SH NAME bindtextdomain \- set directory containing message catalogs .SH SYNOPSIS diff --git a/man/gettext.3 b/man/gettext.3 index 77e789775..4892c4786 100644 --- a/man/gettext.3 +++ b/man/gettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.4" +.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.6-pre2" .SH NAME gettext, dgettext, dcgettext \- translate message .SH SYNOPSIS diff --git a/man/gettextize.1 b/man/gettextize.1 index fd11a0e43..a157de630 100644 --- a/man/gettextize.1 +++ b/man/gettextize.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH GETTEXTIZE "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH GETTEXTIZE "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME gettextize \- install or upgrade gettext infrastructure .SH SYNOPSIS diff --git a/man/msgattrib.1 b/man/msgattrib.1 index 5e30653ae..136e2cd10 100644 --- a/man/msgattrib.1 +++ b/man/msgattrib.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGATTRIB "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGATTRIB "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgattrib \- attribute matching and manipulation on message catalog .SH SYNOPSIS diff --git a/man/msgcat.1 b/man/msgcat.1 index 7702e5d23..0ec2511fa 100644 --- a/man/msgcat.1 +++ b/man/msgcat.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCAT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGCAT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgcat \- combines several message catalogs .SH SYNOPSIS diff --git a/man/msgcmp.1 b/man/msgcmp.1 index f864b7ee9..0ff84a1b5 100644 --- a/man/msgcmp.1 +++ b/man/msgcmp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCMP "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGCMP "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgcmp \- compare message catalog and template .SH SYNOPSIS diff --git a/man/msgcomm.1 b/man/msgcomm.1 index 4dd0468e5..f92d811fc 100644 --- a/man/msgcomm.1 +++ b/man/msgcomm.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCOMM "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGCOMM "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgcomm \- match two message catalogs .SH SYNOPSIS diff --git a/man/msgconv.1 b/man/msgconv.1 index 932f90cd8..82be97590 100644 --- a/man/msgconv.1 +++ b/man/msgconv.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCONV "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGCONV "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgconv \- character set conversion for message catalog .SH SYNOPSIS diff --git a/man/msgen.1 b/man/msgen.1 index 4c9756aa2..1820444a3 100644 --- a/man/msgen.1 +++ b/man/msgen.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEN "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGEN "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgen \- create English message catalog .SH SYNOPSIS diff --git a/man/msgexec.1 b/man/msgexec.1 index 5f4bc2cfe..d09598f30 100644 --- a/man/msgexec.1 +++ b/man/msgexec.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEXEC "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGEXEC "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgexec \- process translations of message catalog .SH SYNOPSIS diff --git a/man/msgfilter.1 b/man/msgfilter.1 index 29cddf1d9..8557e8a17 100644 --- a/man/msgfilter.1 +++ b/man/msgfilter.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFILTER "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGFILTER "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgfilter \- edit translations of message catalog .SH SYNOPSIS diff --git a/man/msgfmt.1 b/man/msgfmt.1 index c045d6989..16a035974 100644 --- a/man/msgfmt.1 +++ b/man/msgfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFMT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGFMT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgfmt \- compile message catalog to binary format .SH SYNOPSIS diff --git a/man/msggrep.1 b/man/msggrep.1 index b208d736e..a037ccfd4 100644 --- a/man/msggrep.1 +++ b/man/msggrep.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGGREP "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGGREP "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msggrep \- pattern matching on message catalog .SH SYNOPSIS diff --git a/man/msginit.1 b/man/msginit.1 index 05a05fede..708134d68 100644 --- a/man/msginit.1 +++ b/man/msginit.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGINIT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGINIT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msginit \- initialize a message catalog .SH SYNOPSIS diff --git a/man/msgmerge.1 b/man/msgmerge.1 index 50ea13856..4e10c2eef 100644 --- a/man/msgmerge.1 +++ b/man/msgmerge.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGMERGE "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGMERGE "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgmerge \- merge message catalog and template .SH SYNOPSIS diff --git a/man/msgunfmt.1 b/man/msgunfmt.1 index 300fd9e20..b31134696 100644 --- a/man/msgunfmt.1 +++ b/man/msgunfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNFMT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGUNFMT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msgunfmt \- uncompile message catalog from binary format .SH SYNOPSIS diff --git a/man/msguniq.1 b/man/msguniq.1 index ce5871c36..49fb86ee7 100644 --- a/man/msguniq.1 +++ b/man/msguniq.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNIQ "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH MSGUNIQ "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME msguniq \- unify duplicate translations in message catalog .SH SYNOPSIS diff --git a/man/ngettext.3 b/man/ngettext.3 index 2f2cfc7f3..063ad171b 100644 --- a/man/ngettext.3 +++ b/man/ngettext.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.4" +.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.6-pre2" .SH NAME ngettext, dngettext, dcngettext \- translate message and choose plural form .SH SYNOPSIS diff --git a/man/textdomain.3 b/man/textdomain.3 index b26f96385..59786b4a2 100644 --- a/man/textdomain.3 +++ b/man/textdomain.3 @@ -10,7 +10,7 @@ .\" GNU gettext source code and manual .\" LI18NUX 2000 Globalization Specification .\" -.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.4" +.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.6-pre2" .SH NAME textdomain \- set domain for future gettext() calls .SH SYNOPSIS diff --git a/man/xgettext.1 b/man/xgettext.1 index f4a3c32b0..b6a0936f3 100644 --- a/man/xgettext.1 +++ b/man/xgettext.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH XGETTEXT "1" "July 2002" "GNU gettext 0.11.4" GNU +.TH XGETTEXT "1" "January 2003" "GNU gettext 0.11.6-pre2" GNU .SH NAME xgettext \- extract gettext strings from source .SH SYNOPSIS @@ -41,13 +41,20 @@ If output file is -, output is written to standard output. \fB\-L\fR, \fB\-\-language\fR=\fINAME\fR recognise the specified language (C, C++, ObjectiveC, PO, Python, Lisp, -EmacsLisp, librep, Java, awk, YCP, Tcl, -RST, Glade) +EmacsLisp, librep, Smalltalk, Java, awk, +YCP, Tcl, PHP, RST, Glade) .TP \fB\-C\fR, \fB\-\-c\fR++ shorthand for \fB\-\-language\fR=\fIC\fR++ .PP By default the language is guessed depending on the input file name extension. +.SS "Input file interpretation:" +.TP +\fB\-\-from\-code\fR=\fINAME\fR +encoding of input files +(except for Python, Tcl, Glade) +.PP +By default the input files are assumed to be in ASCII. .SS "Operation mode:" .TP \fB\-j\fR, \fB\-\-join\-existing\fR diff --git a/man/xgettext.1.html b/man/xgettext.1.html index d67fb8e30..41c4a58fa 100644 --- a/man/xgettext.1.html +++ b/man/xgettext.1.html @@ -164,8 +164,8 @@ output. recognise the specified language (C, C++, ObjectiveC, PO, -Python, Lisp, EmacsLisp, librep, Java, awk, YCP, Tcl, RST, -Glade) +Python, Lisp, EmacsLisp, librep, Smalltalk, Java, awk, YCP, +Tcl, PHP, RST, Glade) @@ -186,6 +186,32 @@ shorthand for --language=C++
    By default the language is guessed depending on the input file name extension. + + +
    +Input file interpretation:
    + + + +
    +--from-code=NAME
    + + + +
    +encoding of input files (except for Python, Tcl, +Glade)
    + + + +
    +By default the input files are assumed to be in +ASCII.
    + diff --git a/misc/Makefile.in b/misc/Makefile.in index 1d505b585..a49f0ffee 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -169,7 +167,7 @@ LISP = $(lisp_LISP) ELCFILES = po-compat.elc po-mode.elc DATA = $(gettextsrc_DATA) -DIST_COMMON = ChangeLog Makefile.am Makefile.in autopoint.in elisp-comp \ +DIST_COMMON = ChangeLog Makefile.am Makefile.in autopoint.in \ gettextize.in all: all-am diff --git a/po/be.gmo b/po/be.gmo index 69bc70fe0..1e16bd2c8 100644 Binary files a/po/be.gmo and b/po/be.gmo differ diff --git a/po/be.po b/po/be.po index 282603287..d93613360 100644 --- a/po/be.po +++ b/po/be.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-09-04 18:51+0300\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -15,211 +15,211 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "нерэчаісны аргумэнт `%s' для `%s'" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "неадназначны аргумэнт `%s' для `%s'" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Рэчаісныя аргумэнты:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "памылка ў час чытаньня файла \"%s\"" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "памылка чытаньня \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "памылка запісу файла \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "памылка пасля чытаньня \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Невядомая сістэмная памылка" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s падпрацэс спынены з-за памылкі" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: выбар `%s' неадназначны\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: выбар `%s' патрабуе аргумэнт\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: нераспазнаны выбар `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: нераспазнаны выбар `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: несапраўдны выбар -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: нерэчаісны выбар -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: выбар патрабуе аргумэнт -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: выбар `-W %s' неадназначны\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "памяць вычарпана" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "не магчыма стварыць канвеэр" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s падпрацэс" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s падрацэс атрымаў фатальны сігнал %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -227,22 +227,22 @@ msgid "" msgstr "" "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\"" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -254,33 +254,33 @@ msgstr "" "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n" "магчымасьці выкарыстньня зь якой небудзь мэтай.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Аўтар %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "вельмі шмат аргумэнтаў" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "прапушчаны аргумэнты" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -289,12 +289,12 @@ msgstr "" "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n" " ці: %s [ВЫБАР] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -315,7 +315,7 @@ msgstr "" " [TEXTDOMAIN] MSGID вяртае перакладзеныя паведамленьні суадносна\n" " MSGID з TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -336,25 +336,25 @@ msgstr "" "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n" "Стандартная дырэкторыя для пошуку: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Паведамляйце аб памылках на адрас .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Выкарыстаньне: %s [ВЫБАР]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Друкуе назву вузла.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -369,9 +369,9 @@ msgstr "" " назву маёнтка й прозьвішчы\n" " -i, --ip-address адрас для вузла\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -382,32 +382,32 @@ msgstr "" " -h, --help адлюстроўвае дапамогу й выходзіць\n" " -V, --version выводзіць зьвесткі аб версіі й выходзіць\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "немагчыма атрымаць назву вузла" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "па большай частцы адзін уваходзячы файл зацьверджан" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s і %s узаема выключны" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -416,15 +416,15 @@ msgstr "" "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n" "узьдзейнічае на іх\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -438,8 +438,8 @@ msgstr "" " файлаў\n" "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -452,7 +452,7 @@ msgstr "" "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n" "зададзена, ці замест яго -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -473,7 +473,7 @@ msgstr "" " --no-obsolete прымае састарэлыя #~ паведамленьні\n" " --only-obsolete пакіде састарэлыя #~ паведамленьні\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -492,7 +492,7 @@ msgstr "" " --fuzzy тое, што й --only-fuzzy --clear-fuzzy\n" " --obsolete тое, што й --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -525,12 +525,12 @@ msgstr "" " -s, --sort-output ствараць упарадкаваны вывад\n" " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню файла\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n" @@ -559,7 +559,7 @@ msgstr "" "будуць узяты з першага PO-файла.\n" "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -575,7 +575,7 @@ msgstr "" " файлаў\n" "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -645,7 +645,7 @@ msgstr "" " -s, --sort-output ствараць упарадкаваны вывад\n" " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню файла\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -656,20 +656,20 @@ msgstr "" " -h, --help адлюстроўвае гэту дапамогу і выходзіць\n" " -V, --version выводзіць зьвесткі аб версіі і выходзіць\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "не зададзены ўводзячыя файлы" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "патрабуецца менавіта 2 уводзячых файла" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -687,7 +687,7 @@ msgstr "" "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n" "лепшай праверкі.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -700,7 +700,7 @@ msgstr "" " ref.pot спасылкі на крыніцы\n" " -D, --directory=ДЫРЭКТОРЫЯ дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку файлаў ўводу\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -709,24 +709,24 @@ msgstr "" "Зьмяняльнікі:\n" " -m, --multi-domain прымяніць ref.pot для кожнага маёнтка з def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...але гэта вызначэньне падобна" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "увага: гэта паведамленьне не выкарыстоўваецца" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -734,19 +734,11 @@ msgstr[0] "знойдзена %d фатальная памылка" msgstr[1] "знойдзена %d фатальныя памылкі" msgstr[2] "знойдзена %d фатальных памылак" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "двайное вызначэньне паведамленьня" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...гэта месцазнаходжаньне першага вызначэньня" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "неабходна задаць не менш двух файлаў" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -767,7 +759,7 @@ msgstr "" "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n" "вызначаны. Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -788,7 +780,7 @@ msgstr "" " -u, --unique скарачэньне для --less-than=2, толькі\n" " непаўторныя паведамленьні будуць надрукаваны\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -841,7 +833,7 @@ msgstr "" " -t, --to-code=НАЗВА перакаўтварае кадзіроўку для вываду\n" "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -874,11 +866,11 @@ msgstr "" " -s, --sort-output ствараць упарадкаваны вывад\n" " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню файла\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "невызначан уваходзячы файл" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "патрабуецца менавіта адзін уваходзячы файл" @@ -913,16 +905,16 @@ msgstr "" " -D, --directory=ДЫРЭКТОРЫЯ дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n" "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "прапушчана назва каманды" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -936,7 +928,7 @@ msgstr "" "адзін раз для кожнага пераклада. Яго вывад становіцца вывадам msgexec.\n" "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -945,7 +937,7 @@ msgstr "" "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n" "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -958,34 +950,34 @@ msgstr "" " -D, --directory=ДЫРЭКТОРЫЯ дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n" "Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "памылка запісу ў stdout" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "памылка запісу ў падпрацэс %s" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "прапушчана назва фільтра" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -994,7 +986,7 @@ msgstr "" "ФІЛЬТРАМ можа быць любая праграма, якая чытае пераклады са стандартнага ўводу\n" "й запісвае зьмененыя пераклады ў стандартны вывад.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1009,7 +1001,7 @@ msgstr "" " выкананы\n" " -n, --quiet, --silent выключаць аўтаматычны друк прыклада\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1045,53 +1037,53 @@ msgstr "" " -s, --sort-output ствараць упарадкаваны вывад\n" " -F, --sort-by-file упарадкоўваць вывад па назьве файла\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "памылка ўзаемадзеяньня з падпрацэсам %s" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "памылка чытаньня з падпрацэса %s" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "падпрацэс %s завершыўся з кодам выхаду %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s патрабуе \"-l locale\" спэцыфікацыі" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s рэчаісны толькі з %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s рэчаісны толькі з %s ці %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1099,7 +1091,7 @@ msgstr[0] "%d паведамленьне перакладзена" msgstr[1] "%d паведамленьні перакладзена" msgstr[2] "%d паведамленьняў перакладзена" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1113,7 +1105,7 @@ msgstr[2] "" ",\n" "%d недакладных перакладаў" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1127,17 +1119,17 @@ msgstr[2] "" ",\n" "%d неперакладзеных паведамленьняў" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1151,7 +1143,7 @@ msgstr "" " файлаў\n" "Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1165,7 +1157,7 @@ msgstr "" " больш позьняя вэрсія)\n" " --tcl Tcl рэжым: ствараць tcl/msgcat .msg файл\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1178,7 +1170,7 @@ msgstr "" " --strict уключае рэжым жорсткага адпавяданьня Uniforum\n" "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1197,7 +1189,7 @@ msgstr "" "абмежаваным падкрэсьліваньнем. Выбар -d абавязковы. Кляс запісваецца ў\n" "зададзеную дырэкторыю.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1211,7 +1203,7 @@ msgstr "" " -d ДЫРЭКТОРЫЯ асноўная дырэкторыя .msg каталёгаў паведамленьняў\n" "Выбары -l і -d абавязковыя. Файл .msg запісваецца ў зададзеную дырэкторыю.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1238,7 +1230,7 @@ msgstr "" " menu items\n" " -f, --use-fuzzy use fuzzy entries in output\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1249,7 +1241,7 @@ msgstr "" " -a, --alignment=ЛІК выроўніваць радкі па ЛІКу байтаў (звычайна: %d)\n" " --no-hash дваічны файл не зьмяшчае хэш табліцы\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1264,25 +1256,25 @@ msgstr "" " --statistics друкуе статыстыку аб перакладах\n" " -v, --verbose павялічвае ўзровень шматслоўнасьці\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1290,32 +1282,32 @@ msgstr "" "выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n" "дзяленьне на нуль" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "нерэчаіснае значэньне nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "нерэчаісны выраз формы мнножнага ліку (plural)" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1325,7 +1317,7 @@ msgstr[1] "...але некаторыя паведамленьні маюць т msgstr[2] "" "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1333,141 +1325,149 @@ msgstr[0] "...але некаторыя паведамленьні маюць а msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку" msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\"" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "поле загалоку `%s' прапушчана ў загалоўку\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "увага: загаловак PO-файла мае недакладны пераклад\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n" "будзе выкарыстаны прэфікс" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "дырэктыва `domain %s' ігнаруецца" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "двайное вызначэньне паведамленьня" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...гэта месцазнаходжаньне першага вызначэньня" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "парожняе уваходжаньне `msgstr' прапушчана" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "недакладнае уваходжаньне `msgstr' прапушчана" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1498,7 +1498,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1516,18 +1516,18 @@ msgid "" " --sort-by-file sort output by file location\n" msgstr "" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "памылка запісу ў падпрацэс grep" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1538,12 +1538,12 @@ msgstr "" "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n" "ці .po файл вываду з дапамогай выбару --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Створан %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1552,7 +1552,7 @@ msgstr "" "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n" "карыстальніка.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1561,7 +1561,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1570,7 +1570,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1581,7 +1581,7 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1589,11 +1589,11 @@ msgstr "" "Знойдзен больш чым адзін .pot файл.\n" "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "памылка чытаньня бягучай дырэкторыі" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1601,23 +1601,23 @@ msgstr "" "Ня знойдзен .pot файл у бягучай дырэкторыі.\n" "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() памылка" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "падпрацэс %s, памылка ўводу-вываду" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1629,22 +1629,22 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Беларускі пераклад для %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\"" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" @@ -1652,30 +1652,30 @@ msgstr "" "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n" "са сьпецыфікацыей кодавай старонкі" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "увага: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1684,7 +1684,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1693,12 +1693,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1706,7 +1706,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1715,7 +1715,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1723,33 +1723,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "памылка пераўтварэньня" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1763,7 +1763,7 @@ msgid "" "cannot be found, fuzzy matching is used to produce better results.\n" msgstr "" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1774,7 +1774,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1782,7 +1782,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1799,7 +1799,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1814,15 +1814,15 @@ msgstr "" " -v, --verbose павялічыць узровень шматслоўнасьці\n" " -q, --quiet, --silent забараняць паказальнікі дасягненьняў\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1831,11 +1831,11 @@ msgstr "" "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n" "прапушчана %ld, састарэлых %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " зроблена.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s і яўная назва файла ўзаема выключальны" @@ -1967,12 +1967,12 @@ msgstr "" " -d, --repeated друкаваць толькі паўтараючыеся\n" " -u, --unique друкаваць толькі непаўторныя\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -1981,7 +1981,7 @@ msgstr "" "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n" "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1994,7 +1994,7 @@ msgid "" " COUNT choose singular/plural form based on this value\n" msgstr "" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2009,17 +2009,17 @@ msgstr "" "асяроддзя TEXTDOMAINDIR.\n" "Стандартная дырэкторыя для пошуку: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: увага: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2028,15 +2028,15 @@ msgstr "" "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n" "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Працяг выкананьня... чакаюцца памылкі разбору." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Працяг выкананьня..." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2045,7 +2045,7 @@ msgstr "" "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n" "але iconv() не падтрымлівае \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2053,12 +2053,12 @@ msgstr "" "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n" "павінна выправіць гэту праблему.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2067,7 +2067,7 @@ msgstr "" "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n" "Гэта вэрсія пабудавана без iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2101,134 +2101,134 @@ msgid "plural form has wrong index" msgstr "формы множнага ліку маюць дрэнныі індэкс" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "вельмі шмат памылак..." -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "нерэчаісная шматсімвальная паслядоўнасць" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "памылка iconv" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "памылка ў час чытаньня \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "невядомае ключавое слова \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "нерэчаісная кантралюючая паслядоўнасць" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "сімвал канца файла знаходзіцца ўнутры радка" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "сімвал канца радка знаходзіцца ўнутры радка" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "файл \"%s\" абрэзан" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "файл \"%s\" змяшчае радок не завершаны нулём" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "фармат файла \"%s\" не GNU .mo" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "чакалісь два аргумэнты" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "памылка запісу ў stdout" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "" "немагчыма стварыць часовую дырэкторыю,\n" "выкарыстоўвываючы ўзор \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "нерэчаісная назва Java-класа: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "немагчыма стварыць \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "памылка ў час запісу файла \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n" "ці ўсталяваць пераменную асяроддзя $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "памылка ў час адкрыцця \"%s\" для запісу" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2242,64 +2242,64 @@ msgstr "" "выкарыстаньня толькі ASCII сымбаляў у msgid\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "немагчыма стварыць файл вываду \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "стандартны вывад" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: увага: незавершаная сімвальная канстанта" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: увага: незавершаны радок" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "гэты файл можа не змяшчаць дырэктыў дамену" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: нерэчаіснае вызначэньне радка" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: прапушчан нумар пасьля #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: нерэчаісны выраз-радок" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext не можа працаваць без ключавых слоў для пошуку" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2308,7 +2308,7 @@ msgstr "" "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n" "і для кароткі. Тое саме-ж і для выбарачных аргумэнтаў.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2318,19 +2318,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2340,7 +2349,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2359,7 +2368,7 @@ msgstr "" " --debug больш падрабязны вынік разбору радка\n" " фарматаваньня\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2403,11 +2412,18 @@ msgstr "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "стандартны ўвод" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2417,7 +2433,7 @@ msgstr "" "gettext(\"\") вяртае загаловак зь\n" "метададзенымі, а ня пусты радок.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "невядомая мова `%s'" diff --git a/po/ca.gmo b/po/ca.gmo index 022cc681a..ed7821d50 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 40db267a3..86bff0857 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-08 22:00+0200\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" @@ -14,149 +14,149 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "l'argument «%s» no és vàlid per «%s»" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "l'argument «%s» és ambigu per «%s»" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Els arguments vàlids són:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error en obrir «%s» per llegir" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "no s'ha pogut obrir el fitxer còpia de seguretat «%s» per escriure" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "error en llegir «%s»" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "error en escriure «%s»" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "error després d'haver llegit «%s»" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Error desconegut del sistema" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "el subprocés «%s» ha fallat" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'opció «%s» és ambígua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'opció «--%s» no admet arguments\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'opció «%c%s» no admet arguments\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'opció «%s» necessita un argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: l'opció «--%s» no és reconeguda\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: l'opció «%c%s» no és reconeguda\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: no es permet l'opció «%c»\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: l'opció «%c» no és vàlida\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'opció «%c» necessita un argument\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'opció «-W %s» és ambígua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'opció «-W %s» no admet arguments\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "no s'ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu «$JAVAC»" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "no s'ha trobat cap màquina virtual Java, instal·leu «gij» o establiu «$JAVA»" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "la memòria s'ha exhaurit" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "no s'ha pogut crear una canonada" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "subprocés «%s»" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "el subprocés «%s» ha rebut el senyal fatal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "el nombre d'especificacions de format en «msgid» i «%s» no coincideix" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" @@ -164,8 +164,8 @@ msgstr "" "les especificacions de format en «msgid» i «%s» de l'argument %u no són les " "mateixes" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -173,13 +173,13 @@ msgstr "" "no existeix una especificació de format, com en «%2$s», de l'argument %1$u " "en «msgid»" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "no existeix una especificació de format de l'argument %u en «%s»" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -188,12 +188,12 @@ msgstr "" "no existeix una especificació de format, com en «%2$s», de l'argument {%1$u} " "en «msgid»" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "no existeix una especificació de format de l'argument {%u} en «%s»" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" @@ -201,18 +201,18 @@ msgstr "" "les especificacions de format en «msgid» i «%s» de l'argument {%u} no són " "les mateixes" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "les especificacions de format en «msgid» i «%s» no són equivalents" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "les especificacions de format de «%s» no són un subconjunt de les de «msgid»" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -221,7 +221,7 @@ msgstr "" "les especificacions de format de «msgid» necessiten un mapa, les de «%s» una " "tupla" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -230,7 +230,7 @@ msgstr "" "les especificacions de format de «msgid» necessiten una tupla, les de «%s» " "un mapa" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -239,12 +239,12 @@ msgstr "" "no existeix una especificació de format, com en «%2$s», de l'argument «%1$s» " "en «msgid»" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "no existeix una especificació de format de l'argument «%s» en «%s»" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -252,11 +252,11 @@ msgstr "" "les especificacions de format en «msgid» i «%s» de l'argument «%s» no són " "les mateixes" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -268,33 +268,33 @@ msgstr "" "de còpia. No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n" "ADEQUACIÓ A UN PROPÒSIT PARTICULAR.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Escrit per %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "sobren arguments" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "manquen arguments" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu «%s --help» per obtenir més informació.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -303,12 +303,12 @@ msgstr "" "Forma d'ús: %s [OPCIÓ] [[DOMINITEXTUAL] IDMSG]\n" " o: %s [OPCIÓ] -s [IDMSG]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Mostra la traducció a llengua nativa d'un missatge textual.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -330,7 +330,7 @@ msgstr "" " [DOMINITEXTUAL] IDMSG obté el missatge traduït corresponent\n" " a l'IDMSG del DOMINITEXTUAL\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -351,25 +351,25 @@ msgstr "" "els missatges que troba en el catàleg seleccionat.\n" "Directori estàndard de recerca: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Informeu dels errors a .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Forma d'ús: %s [OPCIÓ]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Mostra el nom d'estació de la màquina.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -384,9 +384,9 @@ msgstr "" " completament qualificat i els àlies\n" " -i, --ip-address adreces corresponents al nom d'estació\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -397,32 +397,32 @@ msgstr "" " -h, --help mostra aquesta ajuda i ix\n" " -V, --version mostra informació sobre la versió i ix\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "no s'ha pogut obtenir el nom d'estació" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "es permet com a molt un fitxer d'entrada" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "«%s» i «%s» són mútuament excloents" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -431,9 +431,9 @@ msgstr "" "Filtra els missatges d'un catàleg de traduccions segons els seus atributs,\n" "i manipula aquests atributs.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" @@ -441,7 +441,7 @@ msgstr "" "Els arguments obligatoris per les opcions llargues també ho són\n" "per les opcions curtes corresponents.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -456,8 +456,8 @@ msgstr "" "Si no s'especifica cap fitxer d'entrada, o si aquest és «-», es llegirà\n" "l'entrada estàndard.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -470,7 +470,7 @@ msgstr "" "Els resultats s'escriuran en l'eixida estàndard si no s'especifica cap\n" "fitxer d'eixida, o si aquest és «-».\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -491,7 +491,7 @@ msgstr "" " --no-obsolete elimina els missatges obsolets (#~)\n" " --only-obsolete manté els missatges obsolets (#~)\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -510,7 +510,7 @@ msgstr "" " --fuzzy sinònim de «--only-fuzzy --clear-fuzzy»\n" " --obsolete sinònim de «--only-obsolete --clear-obsolete»\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -545,12 +545,12 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "s'ha especificat un criteri de selecció impossible (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]...\n" @@ -581,7 +581,7 @@ msgstr "" "«--use-first», en el qual cas es treuran del primer fitxer PO que els\n" "definesca. Les posicions de fitxer de tots els fitxers PO s'acumularan.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -598,7 +598,7 @@ msgstr "" " de fitxers d'entrada\n" "Si el fitxer d'entrada és «-» es llegirà l'entrada estàndard.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -672,7 +672,7 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -683,20 +683,20 @@ msgstr "" " -h, --help mostra aquesta ajuda i ix\n" " -V, --version mostra informació sobre la versió i ix\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "no s'ha especificat cap fitxer d'entrada" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "es necessiten exactament 2 fitxers d'entrada" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Forma d'ús: %s [OPCIÓ] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -714,7 +714,7 @@ msgstr "" "del vostre programa. Quan no es puga trobar una coincidència exacta,\n" "s'usarà una comparació difusa per produir uns diagnòstics millors.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -728,7 +728,7 @@ msgstr "" " -D, --directory=DIRECTORI afig el DIRECTORI a la llista de recerca\n" " de fitxers d'entrada\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -738,46 +738,38 @@ msgstr "" " -m, --multi-domain aplica «ref.pot» a cadascun dels dominis\n" " de «def.po»\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "aquest missatge s'usa però no s'ha definit..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...però aquesta definició és similar" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "aquest missatge s'usa però no s'ha definit en «%s»" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "avís: aquest missatge no s'usa" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "s'ha trobat %d error fatal" msgstr[1] "s'han trobat %d errors fatals" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "la definició del missatge és duplicada" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...aquesta és la ubicació de la primera definició" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "cal que especifiqueu almenys dos fitxers" # ivb (2001/12/24) # ivb Aquesta traducció no és completament literal però queda més clar. # ivb Amb «commonality» vol dir «nombre de coincidències». -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -798,7 +790,7 @@ msgstr "" "fitxer PO que els definesca. Les posicions de fitxer de tots els fitxers\n" "PO s'acumularan.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -818,7 +810,7 @@ msgstr "" " -u, --unique abreviatura de «--less-than=2», fa que\n" " només s'escriguen els missatges únics\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -872,7 +864,7 @@ msgstr "" " -t, --to-code=NOM codificació de l'eixida\n" "La codificació per defecte és la del locale actual.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -907,11 +899,11 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "no s'ha especificat cap fitxer d'entrada" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "es necessita exactament un fitxer d'entrada" @@ -947,16 +939,16 @@ msgstr "" " de fitxers d'entrada\n" "Si el fitxer d'entrada és «-» es llegirà l'entrada estàndard.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "manca el nom d'una ordre" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Forma d'ús: %s [OPCIÓ] ORDRE [OPCIÓ-D'ORDRE]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -971,7 +963,7 @@ msgstr "" "eixida esdevé l'eixida de «msgexec». El codi de retorn de «msgexec» és el\n" "màxim de totes les invocacions del programa.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -980,7 +972,7 @@ msgstr "" "L'ordre incorporada «0» genera la traducció seguida d'un octet nul.\n" "L'eixida de «msgexec 0» és adequada com a entrada per «xargs -0».\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -995,34 +987,34 @@ msgstr "" "Si no s'especifica cap fitxer d'entrada, o si aquest és «-», es llegirà\n" "l'entrada estàndard.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "no s'ha pogut escriure en l'eixida estàndard" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "no s'ha pogut escriure al subprocés «%s»" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "manca el nom d'un filtre" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "cal que especifiqueu almenys un guió de «sed»" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Forma d'ús: %s [OPCIÓ] FILTRE [OPCIÓ-DE-FILTRE]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Aplica un filtre a cada traducció d'un catàleg de traduccions.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1031,7 +1023,7 @@ msgstr "" "El FILTRE pot ser qualsevol programa que llija una traducció de l'entrada\n" "estàndard i n'escriga una de modificada en l'eixida estàndard.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1047,7 +1039,7 @@ msgstr "" " -n, --quiet, --silent evita la impressió automàtica de l'espai\n" " del patró\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1083,90 +1075,90 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "no s'ha pogut establir una E/S no blocadora amb el subprocés «%s»" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "la comunicació amb el subprocés «%s» ha fallat" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "no s'ha pogut llegir del subprocés «%s»" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "el subprocés «%s» ha terminat amb codi d'eixida %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "cal que l'argument de «%s» siga un sol caràcter de puntuació" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "«%s» necessita una especificació «-d directori»" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "«%s» necessita una especificació «-l locale»" # ivb (2001/12/26) # ivb Els «%s» es refereixen a opcions -> femení. -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "«%s» només és vàlida amb «%s»" # ivb (2001/12/26) # ivb Els «%s» es refereixen a opcions -> femení. -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "«%s» només és vàlida amb «%s» o «%s»" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d missatge traduït" msgstr[1] "%d missatges traduïts" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traducció difusa" msgstr[1] ", %d traduccions difuses" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d missatge no traduït" msgstr[1] ", %d missatges no traduïts" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Forma d'ús: %s [OPCIÓ] nomfitxer.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" "Genera un catàleg binari de missatges partint d'una descripció textual\n" "de traduccions.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1182,7 +1174,7 @@ msgstr "" # ivb (2002/03/14) # ivb Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl. -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1198,7 +1190,7 @@ msgstr "" " --tcl mode Tcl: genera un fitxer «.msg»\n" " de «msgcat» de Tcl\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1211,7 +1203,7 @@ msgstr "" " --strict habilita el mode Uniforum estricte\n" "Si el fitxer d'eixida és «-» s'escriurà en l'eixida estàndard.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1231,7 +1223,7 @@ msgstr "" "recurs, separats per un caràcter de subratllat. L'opció «-d» és obligatòria.\n" "La classe s'escriurà sota el directori especificat.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1249,7 +1241,7 @@ msgstr "" # ivb (2001/12/26) # ivb Segons la documentació, quan ací diu «language» es refereix a un de # ivb programació. -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1280,7 +1272,7 @@ msgstr "" " de teclat per ítems de menú\n" " -f, --use-fuzzy usa en l'eixida les entrades «fuzzy»\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1293,7 +1285,7 @@ msgstr "" " --no-hash fa que el fitxer binari no incloga\n" " la taula de dispersió\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1311,26 +1303,26 @@ msgstr "" # ivb (2002/01/03) # ivb En aquestes frases, tant «nplurals» com «plural» es refereixen a # ivb variables del camp «Plural-Forms» de la capçalera. -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "l'expressió de «plural» pot produir valors negatius" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "«nplurals» és %lu, però l'expressió de «plural» pot produir valors de fins %" "lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "l'expressió de «plural» pot produir una divisió entre zero" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "l'expressió de «plural» pot produir un desbordament enter" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1338,39 +1330,39 @@ msgstr "" "l'expressió de «plural» pot produir excepcions aritmètiques, possiblement " "divisions entre zero" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "el catàleg de missatges té traduccions amb forma plural..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...però l'atribut «plural=EXPRESSIÓ» manca en l'entrada de capçalera" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...però l'atribut «nplurals=ENTER» manca en l'entrada de capçalera" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "el valor d'«nplurals» no és vàlid" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "l'expressió de «plural» no és vàlida" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "«nplurals» és %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...però alguns missatges només tenen una forma plural" msgstr[1] "...però alguns missatges només tenen %lu formes plurals" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1380,12 +1372,12 @@ msgstr[1] "...per # ivb (2002/03/14) # ivb El «%s» es refereix a un idioma, i tot el missatge recomana usar una # ivb entrada de capçalera «Plural-Forms:». -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Proveu d'usar açò, vàlid per a l'idioma %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1393,124 +1385,132 @@ msgstr "" "el catàleg de missatges té traduccions amb forma plural, però hi manca una " "entrada de capçalera amb «Plural-Forms: nplurals=ENTER; plural=EXPRESSIÓ;»" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "ambdues entrades «msgid» i «msgid_plural» no comencen per «\\n»" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "ambdues entrades «msgid» i «msgstr[%u]» no comencen per «\\n»" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "ambdues entrades «msgid» i «msgid_plural» no acaben en «\\n»" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "ambdues entrades «msgid» i «msgstr[%u]» no acaben en «\\n»" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "el maneig de plurals és una extensió del «gettext» GNU" # ivb (2002/12/16) # ivb Ací el segon «%s» és el nom d'un llenguatge de programació. -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "la de «%s» no és una cadena de format vàlida en %s, la de «msgid» sí" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "manca la marca d'accelerador de teclat «%c» en «msgstr»" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "sobren marques d'accelerador de teclat «%c» en «msgstr»" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "manca el camp de capçalera «%s» en la capçalera\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "cal que el camp de capçalera «%s» comence en l'inici de la línia\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" "alguns camps de la capçalera encara tenen els valors inicials per defecte\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "el camp «%s» encara té el valor inicial per defecte\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "avís: la conversió del joc de caràcters no funcionarà\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "avís: la capçalera del fitxer PO està marcada amb «fuzzy»\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "el nom de domini «%s» no és adequat com a nom de fitxer" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "el nom de domini «%s» no és adequat com a nom de fitxer: se n'usarà un prefix" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "es descarta la directiva «domain %s»" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "la definició del missatge és duplicada" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...aquesta és la ubicació de la primera definició" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "es descarta l'entrada «msgstr» buida" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "es descarta l'entrada «msgstr» difusa" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: avís: el fitxer font conté una traducció difusa" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "no es pot usar l'opció «%c» abans d'especificar «K» o «T»" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1519,7 +1519,7 @@ msgstr "" "Extrau d'un catàleg de traduccions tots els missatges que concorden amb\n" "un patró especificat o que pertanyen a uns fitxers font indicats.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1580,7 +1580,7 @@ msgstr "" " -f, --file=FITXER obté el PATRÓ del FITXER\n" " -i, --ignore-case no diferencia entre majúscules i minúscules\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1615,11 +1615,11 @@ msgstr "" " --sort-output genera una eixida ordenada\n" " --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "no s'ha pogut escriure al subprocés «grep»" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1629,7 +1629,7 @@ msgstr "" "de la vostra variable d'entorn «LANG», tal i com es descriu en el fitxer\n" "«ABOUT-NLS». Açò cal per a que pugueu comprovar les vostres traduccions.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1640,12 +1640,12 @@ msgstr "" "Per favor, especifiqueu el locale amb l'opció «--locale»\n" "o el fitxer PO d'eixida amb l'opció «--output-file».\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "S'ha creat «%s».\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1654,7 +1654,7 @@ msgstr "" "Crea un fitxer PO nou, inicialitzant-ne la metainformació amb valors\n" "de l'entorn de la usuària/l'usuari.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1668,7 +1668,7 @@ msgstr "" "directori actual. Si el fitxer d'entrada és «-» es llegirà l'entrada\n" "estàndard.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1682,7 +1682,7 @@ msgstr "" "«--locale» o de la configuració de locale de la usuària/l'usuari.\n" "Si és «-», els resultats s'escriuran en l'eixida estàndard.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1700,7 +1700,7 @@ msgstr "" " --no-wrap no parteix en diverses línies les línies\n" " de missatge més llargues que l'ample de pàgina\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1708,11 +1708,11 @@ msgstr "" "S'ha trobat més d'un fitxer «.pot».\n" "Per favor, especifiqueu el fitxer POT d'entrada amb l'opció «--input».\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "error en llegir el directori actual" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1720,23 +1720,23 @@ msgstr "" "No s'ha trobat cap fitxer «.pot» en el directori actual.\n" "Per favor, especifiqueu el fitxer POT d'entrada amb l'opció «--input».\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "ha fallat fdopen()" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "error d'E/S amb el subprocés «%s»" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "el subprocés «%s» ha fallat amb codi d'eixida %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1752,22 +1752,22 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Traduccions al català del paquet «%s»" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "el joc de caràcters actual, «%s», no és un nom portable de codificació" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "el fitxer d'entrada conté dos jocs de caràcters distints, «%s» i «%s»" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" @@ -1775,7 +1775,7 @@ msgstr "" "el fitxer d'entrada «%s» no conté una entrada de capçalera amb una " "especificació de joc de caràcters" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1784,20 +1784,20 @@ msgstr "" "el domini «%s» del fitxer d'entrada «%s» no conté una entrada de capçalera " "amb una especificació de joc de caràcters" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" "el joc de caràcters destinació, «%s», no és un nom portable de codificació" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "avís: " # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1808,7 +1808,7 @@ msgstr "" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1823,7 +1823,7 @@ msgstr "" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1838,14 +1838,14 @@ msgstr "" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Establiu «LC_ALL» a un locale amb codificació «%s».\n" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1858,7 +1858,7 @@ msgstr "" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1873,7 +1873,7 @@ msgstr "" # ivb (2002/01/07) # ivb Em sembla que açò és «no-wrap». -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1884,17 +1884,17 @@ msgstr "" "L'eixida de «%s» pot ser incorrecta.\n" "Una solució possible és establir «LC_ALL=C».\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "la conversió ha fallat" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" "el fitxer d'entrada no conté una entrada de capçalera amb una especificació " "de joc de caràcters" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1903,7 +1903,7 @@ msgstr "" "No es pot convertir de «%s» en «%s». «%s» es basa en iconv(), i iconv() no " "suporta aquesta conversió." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1912,11 +1912,11 @@ msgstr "" "No es pot convertir de «%s» en «%s». %s es basa en iconv(). Aquesta versió " "ha estat construïda sense iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "tipus de còpia de seguretat" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1940,7 +1940,7 @@ msgstr "" "de fitxer seran preservades. Quan no es puga trobar una coincidència\n" "exacta s'usarà una comparació difusa per produir uns resultats millors.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1958,7 +1958,7 @@ msgstr "" " -C, --compendium=FITXER biblioteca addicional de traduccions de\n" " missatges, es pot especificar diverses voltes\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1969,7 +1969,7 @@ msgstr "" " -U, --update actualitza «def.po»,\n" " no fa res si «def.po» ja es troba actualitzat\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -2000,7 +2000,7 @@ msgstr "" "El sufix de còpia de seguretat és «~», a no ser que s'establesca amb\n" "«--suffix» o amb la variable d'entorn «SIMPLE_BACKUP_SUFFIX».\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -2015,11 +2015,11 @@ msgstr "" " -v, --verbose augmenta el nivell de descripció\n" " -q, --quiet, --silent no mostra els indicadors de progrés\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "cal definir formes plurals d'aquest missatge" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "no s'han de definir formes plurals d'aquest missatge" @@ -2027,7 +2027,7 @@ msgstr "no s'han de definir formes plurals d'aquest missatge" # ivb Pense que «aprofitades» queda més clar que «mesclades»; es refereix # ivb a les traduccions obteses directament de «def.po». El primer «%s» és # ivb (o no) una nova línia. -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2038,11 +2038,11 @@ msgstr "" # ivb (2002/01/08) # ivb Indica el final del processament, el gènere i nombre no són importants. -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " fet.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "«%s» i els noms explícits de fitxer són mútuament excloents" @@ -2204,12 +2204,12 @@ msgstr "" " -u, --unique només mostra els missatges únics,\n" " descartant els duplicats\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Forma d'ús: %s [OPCIÓ] [DOMINITEXTUAL] IDMSG IDMSG-PLURAL NOMBRE\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2218,7 +2218,7 @@ msgstr "" "Mostra la traducció a llengua nativa d'un missatge textual la forma\n" "gramatical del qual depén del nombre.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2242,7 +2242,7 @@ msgstr "" " NOMBRE escull la forma singular o la plural\n" " basant-se en aquest valor\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2257,12 +2257,12 @@ msgstr "" "la variable d'entorn «TEXTDOMAINDIR».\n" "Directori estàndard de recerca: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: avís: " @@ -2270,7 +2270,7 @@ msgstr "%s: av # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». # ivb Es refereix a tots els missatges -> plural. -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2280,17 +2280,17 @@ msgstr "" "És possible que la conversió dels missatges al joc de caràcters de\n" "la usuària/l'usuari no funcione.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Es continua de totes formes, espereu errors d'interpretació." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Es continua de totes formes." # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2301,7 +2301,7 @@ msgstr "" # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2309,14 +2309,14 @@ msgstr "" "Instal·lar «libiconv» GNU i reinstal·lar «gettext» GNU\n" "resoldria aquest problema.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2328,7 +2328,7 @@ msgstr "" # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». # ivb Es refereix a tots els missatges -> plural. -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2362,81 +2362,81 @@ msgid "plural form has wrong index" msgstr "la forma plural té un índex incorrecte" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "hi ha massa errors, avortant" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "la seqüència multioctet no és vàlida" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "hi ha una seqüència multioctet incompleta al final del fitxer" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "hi ha una seqüència multioctet incompleta al final de la línia" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "ha fallat iconv()" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "error en llegir «%s»" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "la paraula clau «%s» no és coneguda" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "la seqüència de control no és vàlida" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "s'ha trobat el final de fitxer emmig d'una cadena" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "s'ha trobat un final de línia emmig d'una cadena" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "el fitxer «%s» és truncat" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "el fitxer «%s» conté una cadena no terminada en nul" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "el fitxer «%s» no és en el format MO de GNU" # ivb (2002/08/08) # ivb «%s» és una cadena amb forma «sysdep_string[%u]» -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "el fitxer «%s» conté una cadena no terminada en nul, en %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "calen dos arguments" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Forma d'ús: %s [OPCIÓ] URL FITXER\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2445,47 +2445,47 @@ msgstr "" "Obté i mostra el contingut d'una URL. Si no es pot accedir a la URL,\n" "s'usarà el FITXER accessible localment en comptes d'aquella.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "error en escriure en l'eixida estàndard" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" "no s'ha pogut trobar un directori temporal, proveu a establir «$TMPDIR»" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "no s'ha pogut crear un directori temporal amb la plantilla «%s»" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "«%s» no és un nom vàlid de classe Java" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "no s'ha pogut crear «%s»" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "error en escriure el fitxer «%s»" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "no s'ha pogut compil·lar la classe Java, per favor useu «--verbose» o " "establiu «$JAVAC»" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "error en obrir «%s» per escriure" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2493,7 +2493,7 @@ msgstr "" "els missatges internacionalitzats no han de contenir la seqüència d'escapada " "«%c»" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2507,65 +2507,65 @@ msgstr "" "«msgid» purament ASCII en comptes d'aquest.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "no s'ha pogut crear el fitxer d'eixida «%s»" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "eixida estàndard" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: avís: el literal caràcter no és terminat" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: avís: el literal cadena no és terminat" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "aquest fitxer no ha de contenir directives «domain»" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: la definició de cadena no és vàlida" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: manca un número després de «#»" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: l'expressió de cadena no és vàlida" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "no es pot usar «--join-existing» quan s'escriu en l'eixida estàndard" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "«xgettext» no funciona sense paraules clau que cercar" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "avís: l'extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb «C»" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extreu les cadenes traduïbles dels fitxers d'entrada especificats.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2574,7 +2574,7 @@ msgstr "" "Els arguments obligatoris per les opcions llargues també ho són per les\n" "opcions curtes corresponents. El mateix ocorre amb els arguments opcionals.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2591,14 +2591,14 @@ msgstr "" " el DIRECTORI\n" "Si el fitxer d'eixida és «-» s'escriurà en l'eixida estàndard.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2610,7 +2610,16 @@ msgstr "" "Per defecte s'endevina el llenguatge fent servir l'extensió del nom\n" "del fitxer d'entrada.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2628,7 +2637,7 @@ msgstr "" " (o aquells que precedeixen les línies amb\n" " una paraula clau) en el fitxer d'eixida\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2647,7 +2656,7 @@ msgstr "" " --debug escriu unes marques més detallades\n" " de reconeixement de cadenes de format\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2697,13 +2706,20 @@ msgstr "" " -M, --msgstr-suffix[=CADENA] usa la CADENA o «» com a sufix de\n" " les entrades «msgstr»\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrada estàndard" +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». -#: src/xgettext.c:946 +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2713,7 +2729,7 @@ msgstr "" "«gettext(\"\")» retorna l'entrada de capçalera amb metainformació,\n" "no la cadena buida.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "el llenguatge «%s» no és conegut" diff --git a/po/cs.gmo b/po/cs.gmo index f1ce10c59..e1e186d50 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 9a329ef34..072ea5811 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.38\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-08-18 15:22+0200\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -22,192 +22,192 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174 # src/xget-lex.c:191 src/xgettext.c:616 -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "chyba pøi otevírání souboru \"%s\" pro ètení" # src/msgfmt.c:321 -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "chyba pøi otevírání souboru \"%s\" pro zápis" # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254 -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "chyba pøi ètení \"%s\"" # src/message.c:1182 -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "chyba pøi zápisu do souboru \"%s\"" # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254 -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "chyba pøi ètení \"%s\"" # lib/error.c:91 -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Neznámá systémová chyba" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" # lib/getopt.c:628 -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pøepínaè `%s' není jednoznaèný\n" # lib/getopt.c:652 -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n" # lib/getopt.c:657 -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n" # lib/getopt.c:674 lib/getopt.c:847 -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: pøepínaè `%s' vy¾aduje argument\n" # lib/getopt.c:703 -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznámý pøepínaè `--%s'\n" # lib/getopt.c:707 -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznámý pøepínaè `%c%s'\n" # lib/getopt.c:733 -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" # lib/getopt.c:736 -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" # lib/getopt.c:766 lib/getopt.c:896 -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pøepínaè vy¾aduje argument -- %c\n" # lib/getopt.c:813 -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n" # lib/getopt.c:831 -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" # lib/xmalloc.c:82 -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "pamì» vyèerpána" # src/message.c:1115 -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "výstupní soubor \"%s\" nelze vytvoøit" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" # src/msgfmt.c:892 -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný" # src/msgfmt.c:909 -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -215,32 +215,32 @@ msgid "" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:892 -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný" # src/msgfmt.c:909 -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:892 -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -248,7 +248,7 @@ msgid "" msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný" # src/msgfmt.c:892 -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -256,7 +256,7 @@ msgid "" msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný" # src/msgfmt.c:909 -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -264,13 +264,13 @@ msgid "" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "formátovací specifikátory pro argument %lu nejsou stejné" # src/msgfmt.c:909 -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -278,11 +278,11 @@ msgstr "form # src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251 # src/msgunfmt.c:175 src/xgettext.c:394 -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -296,50 +296,50 @@ msgstr "" # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256 # src/msgunfmt.c:180 src/xgettext.c:399 -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Autor: %s\n" # src/gettextp.c:164 -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "pøíli¹ mnoho argumentù" # src/gettextp.c:154 -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "chybí argumenty" # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298 # src/msgunfmt.c:210 src/xgettext.c:532 -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Více informací získáte pøíkazem `%s --help'.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" # src/gettextp.c:233 -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -362,7 +362,7 @@ msgstr "" " MSGID z TEXTOVÉDOMÉNY\n" # src/gettextp.c:245 -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -387,11 +387,11 @@ msgstr "" # src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331 # src/msgunfmt.c:234 src/xgettext.c:582 -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "" @@ -399,17 +399,17 @@ msgstr "" "(pouze\n" "anglicky), pøipomínky k pøekladu zasílejte na adresu (èesky).\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -419,9 +419,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -429,48 +429,48 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" # src/xgettext.c:378 src/xgettext.c:382 -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s a %s se vzájemnì vyluèují" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -479,8 +479,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -489,7 +489,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -501,7 +501,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -514,7 +514,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -553,12 +553,12 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -592,7 +592,7 @@ msgstr "" "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n" "v souborech bude ponecháno ze v¹ech .po souborù.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -602,7 +602,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -682,7 +682,7 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -691,22 +691,22 @@ msgid "" msgstr "" # src/msgcmp.c:160 src/msgmerge.c:267 -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "vstupní soubory nejsou zadány" # src/msgcmp.c:165 src/msgmerge.c:272 -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "jsou po¾adovány pøesnì 2 vstupní soubory" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" # src/msgcmp.c:186 -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -731,7 +731,7 @@ msgstr "" "va¹em programu. Pokud pøi porovnávání nejsou zprávy pøesnì shodné, zkoumá se,\n" "zda si nejsou podobné.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -740,7 +740,7 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -748,28 +748,28 @@ msgid "" msgstr "" # src/msgcmp.c:259 src/msgmerge.c:711 -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "tato zpráva je pou¾ita, ale nikoli definována..." # src/msgcmp.c:261 src/msgmerge.c:713 -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ale tato definice je podobná" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s" # src/msgcmp.c:281 -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "upozornìní: tato zpráva není pou¾ita" # src/po-lex.c:84 -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -777,21 +777,11 @@ msgstr[0] "nalezena %d z msgstr[1] "nalezeny %d záva¾né chyby" msgstr[2] "nalezeno %d záva¾ných chyb" -# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061 -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "dvojnásobná definice zprávy" - -# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062 -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...toto je umístìní první definice" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "musí být zadány nejménì dva rùzné soubory" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -819,7 +809,7 @@ msgstr "" "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n" "v souborech bude ponecháno ze v¹ech .po souborù.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -848,7 +838,7 @@ msgstr "" "v souborech bude ponecháno ze v¹ech .po souborù.\n" # src/msgmerge.c:303 -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -902,7 +892,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -942,12 +932,12 @@ msgstr "" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" # src/msgfmt.c:273 src/xgettext.c:410 -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "vstupní soubor není zadán" # src/msgcmp.c:165 src/msgmerge.c:272 -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "jsou po¾adovány pøesnì 2 vstupní soubory" @@ -976,17 +966,17 @@ msgid "" msgstr "" # src/gettextp.c:154 -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "chybí argumenty" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -996,14 +986,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -1012,44 +1002,44 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" # src/gettextp.c:154 -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "chybí argumenty" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "musí být zadány nejménì dva rùzné soubory" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1060,7 +1050,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1100,54 +1090,54 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" # src/msgfmt.c:343 -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1156,7 +1146,7 @@ msgstr[1] "%d p msgstr[2] "%d pøelo¾ených zpráv" # src/msgfmt.c:345 -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1165,7 +1155,7 @@ msgstr[1] ", %d ne msgstr[2] ", %d neúplných pøekladù" # src/msgfmt.c:347 -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1173,17 +1163,17 @@ msgstr[0] ", %d nep msgstr[1] ", %d nepøelo¾ené zprávy" msgstr[2] ", %d nepøelo¾ených zpráv" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1192,7 +1182,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1201,7 +1191,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1210,7 +1200,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1222,7 +1212,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1232,7 +1222,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1248,7 +1238,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1256,7 +1246,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1266,58 +1256,58 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" # src/po-lex.c:332 -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "neplatná øídící sekvence" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1326,7 +1316,7 @@ msgstr[1] "tato zpr msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1334,125 +1324,125 @@ msgstr[0] "tato zpr msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s" msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" # src/msgfmt.c:870 -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'" # src/msgfmt.c:870 -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'" # src/msgfmt.c:870 -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'" # src/msgfmt.c:878 -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'" # src/msgfmt.c:878 -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'" # src/msgfmt.c:878 -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" # src/msgfmt.c:561 -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "polo¾ka hlavièky `%s' v hlavièce chybí" # src/msgfmt.c:564 -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku" # src/msgfmt.c:573 -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu" # src/msgfmt.c:583 -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n" "%*s upozornìní: pøevod znakové sady nebude fungovat" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "V hlavièce chybí definice znakové sady.\n" "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n" "%*s upozornìní: pøevod znakové sady nebude fungovat" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" # src/msgfmt.c:471 -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "jméno domény \"%s\" není vhodné jako jméno souboru" # src/msgfmt.c:476 -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" @@ -1460,40 +1450,50 @@ msgstr "" "pøedpona" # src/msgfmt.c:489 -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "pøíkaz `domain %s' ignorován" +# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "dvojnásobná definice zprávy" + +# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062 +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...toto je umístìní první definice" + # src/msgfmt.c:517 -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "prázdná polo¾ka `msgstr' ignorována" # src/msgfmt.c:518 -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "neúplná polo¾ka `msgstr' ignorována" # src/msgfmt.c:668 -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1525,7 +1525,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1564,18 +1564,18 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1583,19 +1583,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1604,7 +1604,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1613,7 +1613,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1624,39 +1624,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1668,52 +1668,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 #, fuzzy msgid "warning: " msgstr "%s: upozornìní: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1722,7 +1722,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1731,12 +1731,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1744,7 +1744,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1753,7 +1753,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1761,15 +1761,15 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1778,7 +1778,7 @@ msgstr "" "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n" "a iconv() \"%s\" nepodporuje.\n" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1787,12 +1787,12 @@ msgstr "" "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n" "Tato verze byla kompilována bez iconv().\n" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" # src/msgmerge.c:321 -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1817,7 +1817,7 @@ msgstr "" "základì podobnosti vzorù. Tím je dosa¾eno lep¹ího slití obou katalogù.\n" " Není-li výstupní soubor urèen, výsledek bude vypisován na standardní výstup.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1828,7 +1828,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1836,7 +1836,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1853,7 +1853,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1864,19 +1864,19 @@ msgid "" msgstr "" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s" # src/msgmerge.c:769 -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1886,12 +1886,12 @@ msgstr "" "chybí %ld, zastaralých %ld.\n" # src/msgmerge.c:775 -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " dokonèeno.\n" # src/xgettext.c:378 src/xgettext.c:382 -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s a %s se vzájemnì vyluèují" @@ -2011,12 +2011,12 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2024,7 +2024,7 @@ msgid "" msgstr "" # src/gettextp.c:233 -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2050,7 +2050,7 @@ msgstr "" " pøeklad\n" # src/gettextp.c:245 -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2066,17 +2066,17 @@ msgstr "" "v promìnné prostøedí TEXTDOMAINDIR.\n" " Adresáø, ve kterém se hledá: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: upozornìní: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2085,15 +2085,15 @@ msgstr "" "Oznaèení znakové sady \"%s\" není portabilní název kódování. \n" "Pøevod znakù do u¾ivatelské znakové sady nebude fungovat.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Pokraèuji, pøedpokládána chyba parsingu." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Pokraèuji." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2102,7 +2102,7 @@ msgstr "" "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n" "a iconv() \"%s\" nepodporuje.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2110,12 +2110,12 @@ msgstr "" "Instalace GNU libiconv a následná reinstalace GNU gettextu\n" "mù¾e napravit tento problém.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2124,7 +2124,7 @@ msgstr "" "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n" "Tato verze byla kompilována bez iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2161,92 +2161,92 @@ msgstr "mno # src/po-lex.c:129 src/po-lex.c:168 #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "pøíli¹ mnoho chyb, konèím" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "neplatná víceznaková sekvence" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "neplatná víceznaková sekvence" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "neplatná víceznaková sekvence" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254 -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "chyba pøi ètení \"%s\"" # src/po-lex.c:241 -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "klíèové slovo \"%s\" není známo" # src/po-lex.c:332 -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "neplatná øídící sekvence" # src/po-lex.c:420 -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "konec souboru uprostøed øetìzce" # src/po-lex.c:415 -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "konec øádku uprostøed øetìzce" # src/msgunfmt.c:267 src/msgunfmt.c:331 -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "soubor \"%s\" je useknutý" # src/msgunfmt.c:373 -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL" # src/msgunfmt.c:373 -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "soubor \"%s\" není v GNU .mo formátu" # src/msgunfmt.c:373 -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL" # src/gettextp.c:164 -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "pøíli¹ mnoho argumentù" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2254,55 +2254,55 @@ msgid "" msgstr "" # src/message.c:1182 -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "chyba pøi zápisu do souboru \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" # src/message.c:1115 -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "výstupní soubor \"%s\" nelze vytvoøit" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" # src/message.c:1182 -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "chyba pøi zápisu do souboru \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" # src/msgfmt.c:321 -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "chyba pøi otevírání souboru \"%s\" pro zápis" # src/message.c:784 -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2312,77 +2312,77 @@ msgid "" msgstr "" # src/message.c:1115 -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "výstupní soubor \"%s\" nelze vytvoøit" # src/message.c:1122 -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standardní výstup" # src/xget-lex.c:892 -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: upozornìní: neukonèená znaková konstanta" # src/xget-lex.c:914 -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù" # src/xgettext.c:658 src/xgettext.c:968 -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" # src/xgettext.c:386 -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat" # src/xgettext.c:501 -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2392,19 +2392,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2414,7 +2423,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2426,7 +2435,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2471,11 +2480,18 @@ msgstr "" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" # src/xget-lex.c:150 -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standardní vstup" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2483,11 +2499,16 @@ msgid "" msgstr "" # src/xgettext.c:1342 -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "jazyk `%s' není znám" +# src/msgunfmt.c:373 +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL" + # src/msgunfmt.c:298 #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "posun v souboru \"%s\" na pozici %ld selhal" diff --git a/po/da.gmo b/po/da.gmo index 4af175c5a..d39e8295e 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index ac5722cd9..237832dba 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-09-07 19:32+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -17,155 +17,155 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "Ugyldigt argument '%s' for '%s'" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "flertydigt argument '%s' for '%s'" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Gyldige argumenter er:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fejl ved læse-åbning af '%s'" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "Kan ikke åbne sikkerhedskopi-fil '%s' for skrivning" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "fejl ved læsning af '%s'" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "fejl ved skrivning til filen '%s'" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "fejl efter læsning af '%s'" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Ukendt systemfejl" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s-underproces mislykkedes" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: tilvalget '%s' kan betyde flere ting\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: tilvalget '--%s' tillader ikke et argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: tilvalget `%s' kræver et argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukendt tilvalg `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukendt tilvalg `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovligt tilvalg -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldigt tilvalg -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: tilvalget '%c' kræver et argument\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: tilvalget '-W %s' er flertydigt\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Virtuel Javamaskine ikke fundet, forsøg at installere gij eller sæt $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "ikke mere ledig hukommelse" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "kan ikke oprette datakanal '%s'" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s underproces" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s underproces fik et dødeligt signal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -173,13 +173,13 @@ msgstr "" "formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid" "\"" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\"" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -187,28 +187,28 @@ msgid "" msgstr "" "formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\"" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\"" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "formatangivelser i 'msgid' og '%s' for argument {%u} er ikke det samme" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "formatangivelser i 'msgid' og '%s' er ikke de samme" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formateringsdirektiv i \"%s\" er ikke en delmængde af dem i \"msgid\"" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -217,7 +217,7 @@ msgstr "" "formateringsdirektiv i \"msgid\" tager en afbildning, dem i \"%s\" tager en " "tuppel" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -226,7 +226,7 @@ msgstr "" "formateringsdirektiv i \"msgid\" tager en tuppel, de i \"%s\" tager en " "afbildning" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -235,23 +235,23 @@ msgstr "" "formateringsdirektiv for argument \"%s\", som i \"%s\", findes ikke i \"msgid" "\"" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "formateringsdirektiv for argument \"%s\" findes ikke i \"%s\"" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" "formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -263,33 +263,33 @@ msgstr "" "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET SÆRLIGT\n" "FORMÅL.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Skrevet af %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "For mange argumenter" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argumenter mangler" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for yderligere oplysninger.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -298,12 +298,12 @@ msgstr "" "Brug: %s [TILVALG] [[TEKSTDOMÆNE] TEKSTID]\n" "eller: %s [TILVALG] -s [TEKSTID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Vis ikke-engelsk oversættelse af en tekstbesked.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -323,7 +323,7 @@ msgstr "" " [TEKSTDOMÆNE] TEKSTID hent den oversatte tekst svarende til\n" " TEKSTID fra TEKSTDOMÆNE\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -344,25 +344,25 @@ msgstr "" "oversættes de tekster der findes i det valgte tekstkatalog.\n" "Standard-filkataloget for søgning er: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Rapportér fejl på engelsk til .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Brug: %s [TILVALG]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Skriv maskinens værtsnavn.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -376,9 +376,9 @@ msgstr "" " -f, --fqdn, --long langt værtsnavn, indholder hele domænenavnet og alias\n" " -i, --ip-address adresser for værtsnavnet\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -389,32 +389,32 @@ msgstr "" " -h, --help vis denne hjælp og afslut\n" " -V, --version vis versionsinformation og afslut\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "kunne ikke hente værtsnavn" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "Højst én inddatalinje tilladt" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s udelukker hinanden" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -423,9 +423,9 @@ msgstr "" "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n" "manipulerer attributterne.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" @@ -433,7 +433,7 @@ msgstr "" "Hvis et langt tilvalg kræver et argument, gælder det også for det tilsvarende\n" "korte tilvalg.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -446,8 +446,8 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis ingen inddatafil er angivet eller den er -, læses fra standard-inddata.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -460,7 +460,7 @@ msgstr "" "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n" "eller hvis den er angivet som - .\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -479,7 +479,7 @@ msgstr "" " --no-obsolete fjern forældede #~ beskeder\n" " --only-obsolete behold forældede #~ beskeder\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -498,7 +498,7 @@ msgstr "" " --fuzzy samme som --only-fuzzy --clear-fuzzy\n" " --obsolete samme som --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -529,12 +529,12 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n" @@ -561,7 +561,7 @@ msgstr "" "men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n" "der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -576,7 +576,7 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis inddatafilen er -, læses fra standard-inddata.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -646,7 +646,7 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -657,20 +657,20 @@ msgstr "" " -h, --help vis denne hjælp og afslut\n" " -V, --version vis versionsinformation og afslut\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ingen filer angivet som inddata" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "der kræves netop to inddatafiler" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -689,7 +689,7 @@ msgstr "" "mellem msgid-tekststrengene, benyttes en upræcis sammenligningsmetode til at\n" "give bedre fejlretningsinformation.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -702,7 +702,7 @@ msgstr "" " ref.pot referencer til kildeteksterne\n" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -711,43 +711,35 @@ msgstr "" "Bearbejdningsvarianter:\n" " -m, --multi-domain brug ref.pot til hvert domæne i def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "denne tekst bruges, men er ikke erklæret..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...men denne tekst ligner" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "denne tekst er brugt, men ikke erklæret i %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "advarsel: denne tekst bliver ikke brugt" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "fandt %d fatal fejl" msgstr[1] "fandt %d fatale fejl" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "tekst erklæret mere end en gang" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "... her er den første erklæring" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "Mindst to filer skal angives" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -767,7 +759,7 @@ msgstr "" "men kun fra den første PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n" "vil blive sammenbragt.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -787,7 +779,7 @@ msgstr "" " -u, --unique kort skrivemåde for --less-than=2, foranlediger\n" " at kun unikke beskeder udskrives\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -836,7 +828,7 @@ msgstr "" " -t, --to-code=NAVN Kodning for uddata\n" "Standardværdi er nuværende locales kodning.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -867,11 +859,11 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "ingen inddatafil angivet" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "der kræves præcist én inddatafil" @@ -906,16 +898,16 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis inddatafilen er -, læses fra standard-input.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "kommandonavn mangler" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Brug: %s [TILVALG] KOMMANDO [KOMMANDOTILVALG]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -930,7 +922,7 @@ msgstr "" "bliver uddata fra msgexec. Slutstatusværdien for msgexec er den største\n" "slutstatusværdi fra alle kommandokørslerne.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -940,7 +932,7 @@ msgstr "" "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n" "\"xargs -O\"\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -953,34 +945,34 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis ingen inddatafil er angivet, eller er -, læses fra standard-input.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "skrivning til standard ud mislykkedes" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "skrivning til %s-underproces mislykkedes" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "filternavn mangler" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "mindst et sed-skript skal angives" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Udfører et filter på alle oversættelser i et beskedskatalog.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -989,7 +981,7 @@ msgstr "" "FILTER kan være hvilket som helst program som læser en oversættelse fra\n" "standard ind og skriver den ændrede oversættelse til standard ud.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1004,7 +996,7 @@ msgstr "" " der skal udføres\n" " -n, --quiet, --silent undertryk automatisk udskrift af resultat\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1037,84 +1029,84 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "kan ikke opsætte ikke-blokerende I/O til %s-underproces" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "kommunikation med %s-underproces mislykkedes" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "læsning fra %s-underproces mislykkedes" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s-underproces afsluttede med slutstatus %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "argumentet til %s bør være et enkelt skilletegn" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s kræver at \"-d katalog\" angives" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s kræver en \"-l lokale\"-angivelse" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s er kun gyldig med %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s er kun gyldig med %s eller %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d oversat tekst" msgstr[1] "%d oversatte tekster" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d uafklaret oversættelse" msgstr[1] ", %d uafklarede oversættelser" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d uoversat tekst" msgstr[1] ", %d uoversatte tekster" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Brug: %s [FLAG] filnavn.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Generér binært tekstkatalog fra oversættelsebeskrivelse i kildetekst.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1126,7 +1118,7 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis inddatafilen er -, læses fra standard-input.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1139,7 +1131,7 @@ msgstr "" " --java2 som --java, og antag Java2 (JDK 1.2 eller højere)\n" " --tcl Tcl-tilstand: generér en tcl/msgcat .msg-fil\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1151,7 +1143,7 @@ msgstr "" " -o, --output-file=FIL uddata skrives til FIL\n" "Hvis uddatafilen er -, skrives uddata til standard-ud.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1170,7 +1162,7 @@ msgstr "" "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n" "i det opgivne katalog.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1185,7 +1177,7 @@ msgstr "" "Flagene -l og -d er obligatoriske. .msg-filen skrives\n" "i det opgivne katalog.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1213,7 +1205,7 @@ msgstr "" " for menuer\n" " -f, --use-fuzzy brug uafklarede poster i resultatet\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1224,7 +1216,7 @@ msgstr "" " -a, --alignment=TAL læg strenge på lige TAL byte (normalt: %d)\n" " --no-hash binærfil indholder ikke hashtabellen\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1239,74 +1231,74 @@ msgstr "" " --statistics udskriv statistik over oversættelser\n" " -v, --verbose forøg udskreven information\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "flertalsudtryk kan give negative værdier" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "flertalsudtryk kan give division med nul" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "flertalsudtryk kan give heltalsoverløb" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "tekstkatalog har oversættelser med flertalsform..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "ugyldig nplurals-værdi" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "ugyldigt flertalsudtryk" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...men nogen tekster har kun én flertalsform" msgstr[1] "...men nogen tekster har kun %lu flertalsformer" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...men nogen tekster har én flertalsform" msgstr[1] "...men nogen tekster har %lu flertalsformer" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Prøv at bruge det følgende, gældende for %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1314,122 +1306,130 @@ msgstr "" "beskedkatalog har oversættelser med flertalsformer, men mangler en " "headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\"" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "flertalsbehandling er en GNU gettext-udvidelse" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\"" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr mangler mærket \"%c\" for tastaturgenvej" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr har for mange mærker \"%c\" for tastaturgenveje" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "feltet `%s' mangler i hovedet\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "feltet '%s' i hovedet bør starte ved linjens begyndelse\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "feltet `%s' har stadig den oprindelige standardværdi\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "advarsel: tegnsætskonvertering vil ikke virke\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "advarsel: PO-filhoved er uafklaret\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domænet '%s' kan ikke bruges som filnavn" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domain %s'-kommando ignoreres" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "tekst erklæret mere end en gang" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "... her er den første erklæring" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "tom `msgstr'-kommando ignoreret" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "\"fuzzy\" `msgstr'-tekst ignoreret" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "" "%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1438,7 +1438,7 @@ msgstr "" "Udtrækker alle beskeder i et beskedskatalog som matcher et vist\n" "mønster eller hører til en given kildetekstfil.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1496,7 +1496,7 @@ msgstr "" " -f, --file=FIL hent MØNSTER fra FIL\n" " -i, --ignore-case versalufølsomt\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1527,11 +1527,11 @@ msgstr "" " --sort-output generér sorteret uddata\n" " --sort-by-file sortér uddata efter filplacering\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "skrivning til grep-underproces mislykkedes" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1541,7 +1541,7 @@ msgstr "" "LANG som beskrevet i filen ABOUT-NLS. Dette er nødvendigt for at\n" "du kan teste dine oversættelser.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1552,12 +1552,12 @@ msgstr "" "Angiv locale med flaget --locale eller\n" ".po-udfilen med flaget --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Oprettede %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1566,7 +1566,7 @@ msgstr "" "Opretter en ny PO-fil og initierer metainformation med værdier fra\n" "brugerens miljøvariabler.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1579,7 +1579,7 @@ msgstr "" "Hvis ingen indfil angives, søges efter POT-filen i aktuelt katalog.\n" "Hvis den er - læses standard ind.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1592,7 +1592,7 @@ msgstr "" "Hvis ingen udfil er angivet, afhænger det af --locale tilvalget eller brugerens\n" "indstilling af locale. Hvis den er - skrives resultaterne på standard ud.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1609,7 +1609,7 @@ msgstr "" " --no-wrap ombryd ikke lange beskeder, længere end\n" " uddatasidens bredde, til flere linjer\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1617,11 +1617,11 @@ msgstr "" "Fandt mere end en .pot-fil.\n" "Angiv .pot-indfil med flaget --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "fejl ved læsning af aktuelt katalog" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1629,23 +1629,23 @@ msgstr "" "Fandt ingen .pot-fil i aktuelt katalog.\n" "Angiv .pot-indfil med flaget --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() mislykkedes" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "I/O-fejl i %s-underproces" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s-underproces fejlede med slutstatus %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1660,28 +1660,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Danske oversættelser for pakke %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "nuværende tegnsæt \"%s\" er ikke et portabelt kodningsnavn" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "to forskellige tegnsæt \"%s\" og \"%s\" i indfilen" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegnsæt" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1690,17 +1690,17 @@ msgstr "" "domæne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af " "tegnsæt" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "advarsel: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1708,7 +1708,7 @@ msgstr "" "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n" "Konverterer resultatet til UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1720,7 +1720,7 @@ msgstr "" "Konverterer resultatet til UTF-8.\n" "Brug flaget --to-code for at vælge en anden kodning.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1733,12 +1733,12 @@ msgstr "" "Resultatet for \"%s\" kan blive forkert.\n" "Mulige måder at omgå problemet er:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Sæt LC_ALL til et locale med kodning %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1749,7 +1749,7 @@ msgstr "" " udfør derefter \"%s\",\n" " konvertér så tilbage til %s med \"msgconv\".\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1762,7 +1762,7 @@ msgstr "" " udfør derefter \"%s\"\n" " konvertér så tilbage til %s med \"msgconv\".\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1773,15 +1773,15 @@ msgstr "" "Resultatet for \"%s\" kan blive forkert.\n" "En mulig måde at omgå problemet er at sætte LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "konverteringsfejl" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1790,7 +1790,7 @@ msgstr "" "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() " "understøtter ikke denne konvertering." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1799,11 +1799,11 @@ msgstr "" "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(). Denne version " "er bygget uden iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "sikkerhedskopitype" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1827,7 +1827,7 @@ msgstr "" "overensstemmelse, vil 'løs søgning' (fuzzy matching) blive brugt til at give\n" "bedre resultater.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1844,7 +1844,7 @@ msgstr "" " -C, --compendium=FIL yderligere bibliotek af tekst-oversættelser,\n" " kan angives mere end én gang\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1855,7 +1855,7 @@ msgstr "" " -U, --update opdatér def.po,\n" " gør ingenting hvis def.po allerede er opdateret\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1884,7 +1884,7 @@ msgstr "" "Endelse for sikkerhedskopier er \"~\", hvis den ikke sættes med --suffix eller\n" "miljøvariablen SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1899,15 +1899,15 @@ msgstr "" " -v, --verbose forøg udskreven information\n" " -q, --quiet, --silent undertryk indikatorer for fremgang\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "denne tekst burde definere flertalsformer" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "denne tekst burde ikke definere flertalsformer" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1916,11 +1916,11 @@ msgstr "" "%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %" "ld, forældede %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " afsluttet.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og udtrykkelige filnavne udelukker hinanden" @@ -2071,12 +2071,12 @@ msgstr "" " -d, --repeated skriv kun gentagede beskeder\n" " -u, --unique skriv kun unikke beskeder, gentagede fjernes\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Brug: %s [TILVALG] [TEKSTDOMÆNE] TEKSTID TEKSTID-FLERTAL ANTAL\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2085,7 +2085,7 @@ msgstr "" "Vis oversættelser i det lokale sprog af tekstbeskeder hvis grammatiske\n" "form beror på et tal.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2106,7 +2106,7 @@ msgstr "" " TEKSTID TEKSTID-FLERTAL oversæt TEKSTID (ental) / TEKSTID-FLERTAL (flertal)\n" " COUNT vælg ental/flertalsform ud fra denne værdi\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2121,17 +2121,17 @@ msgstr "" "TEXTDOMAINDIR.\n" "Standard-filkataloget for søgning er: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: advarsel: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2140,15 +2140,15 @@ msgstr "" "Tegnsæt '%s' er ikke et flytbart kodningsnavn.\n" "Tekstkonvertering til brugers tegnsæt virker muligvis ikke.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Fortsætter alligevel, forvent fortolkningsfejl." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Fortsætter alligevel." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2157,7 +2157,7 @@ msgstr "" "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n" "og iconv() understøtter ikke '%s'.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2165,12 +2165,12 @@ msgstr "" "Installering af GNU libiconv og geninstallering af GNU gettext\n" "vil løse dette problem.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2179,7 +2179,7 @@ msgstr "" "Tegnsæt '%s' er ikke understøttet. %s bygger på iconv(),\n" "Denne version er bygget uden iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2212,79 +2212,79 @@ msgid "plural form has wrong index" msgstr "flertalsform har forkert indeks" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "afbryder kørslen på grund af for mange fejl" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "Ugyldig multibytesekvens" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "Ugyldig multibytesekvens ved slutning på fil" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "Ugyldig multibytesekvens ved slutning på linje" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv-fejl" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "fejl ved læsning af '%s'" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "ukendt nøgleord '%s'" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ugyldig kontrolsekvens" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "tekststreng ikke afsluttet da filens slutning blev nået" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "tekststreng var ikke afsluttet ved linjeskift" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "filen '%s' er afkortet" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "filen '%s' er ikke i GNU .mo-format" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "forventede to argumenter" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Brug: %s [TILVALG] URL FIL\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2293,52 +2293,52 @@ msgstr "" "Henter og udskriver indholdet af en URL. Hvis URL'en ikke kan hentes bruges\n" "den lokale fil FIL i stedet.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "fejl ved skrivning af standard-uddata" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "kan ikke finde et midlertidigt katalog, prøv at sætte $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "ikke et gyldigt Java-klassenavn: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "kunne ikke oprette '%s'" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "fejl ved skrivning til filen '%s'" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt " "$JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "fejl opstået ved skrive-åbning af '%s'" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "oversættelige tekster må ikke indeholde `\\%c'-escapesekvensen" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2351,66 +2351,66 @@ msgstr "" "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikke oprette uddatafil '%s'" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard-uddata" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "denne fil må ikke indeholde 'domain'-kommandoer" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: ugyldig streng-definition" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: mangler tal efter #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: ugyldigt streng-udtryk" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan ikke benyttes når uddata sendes til standard-uddata" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Udtræk oversættelige strenge fra givne indfiler.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2420,7 +2420,7 @@ msgstr "" "korte tilvalg.\n" "Tilvarende gælder for valgfri argumenter.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2435,14 +2435,14 @@ msgstr "" " -p, --output-dir=FILKATALOG uddatafiler placeres i FILKATALOG\n" "Hvis uddatafilen er -, skrives uddata til standard-ud.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2453,7 +2453,16 @@ msgstr "" " RST, Glade)\n" " -C, --c++ kort skrivemåde for --language=C++\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2467,7 +2476,7 @@ msgstr "" " -c, --add-comments[=MÆRKE] placér kommentarafsnit for MÆRKE (eller \n" " de foregående nøgleordslinjer) i uddata\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2484,7 +2493,7 @@ msgstr "" " -T, --trigraphs forstå ISO C-trigrafer i inddata\n" " --debug mere detaljeret resultat af strenggenkendelse\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2525,11 +2534,18 @@ msgstr "" " -m, --msgstr-prefix[=STRENG] brug STRING eller \"\" som forstavelse for msgstr-indgange\n" " -M, --msgstr-suffix[=STRENG] brug STRING eller \"\" som endelse for msgstr-indgange\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard-inddata" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2539,7 +2555,7 @@ msgstr "" "gettext(\"\") returnerer hovedet med metainformation,\n" "ikke den tomme streng.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "ukendt sprog `%s'" diff --git a/po/de.gmo b/po/de.gmo index 3ed7fa422..ac63faef5 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 6bed1987a..0d4cd1cfc 100644 --- a/po/de.po +++ b/po/de.po @@ -75,7 +75,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-09-13 05:57+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -84,200 +84,200 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "ungültiges Argument »%s« für »%s«" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "mehrdeutiges Argument »%s« für »%s«" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Gültige Argumente sind:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "Öffnen der Sicherungsdatei »%s« zum Schreiben fehlgeschlagen" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "Fehler beim Lesen von »%s«" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "Fehler beim Schreiben von »%s«" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "Fehler nach dem Lesen von »%s«" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Unbekannter Systemfehler" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "Subprozess %s fehlgeschlagen" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option »%s« ist mehrdeutig\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option »--%s« erwartet kein Argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Option »%c%s« erwartet kein Argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: Option »%s« erwartet ein Argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unbekannte Option »--%s«\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unbekannte Option »%c%s«\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: unzulässige Option -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Option erwartet ein Argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option »-W %s« ist mehrdeutig\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option »-W %s« erwartet kein Argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n" "$JAVA setzen" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "virtueller Speicher erschöpft" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "Es ist nicht möglich, eine Pipe zu einzurichten" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "Subprozess %s" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "Subprozess %s hat das fatale Signal %d erhalten" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "Anzahl der Formatelemente in »msgid« und »%s« stimmt nicht überein" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" "Formatelemente in »msgid« und »%s« für Argument %u sind nicht identisch" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "ein Formatelement für Argument %u, wie in »%s«, fehlt in »msgid«" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "ein Formatelement für Argument »%u« fehlt in »%s«" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "ein Formatelement für Argument {%u}, wie in »%s«, fehlt in »msgid«" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "ein Formatelement für Argument {%u} fehlt in »%s«" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" "Formatelemente in »msgid« und »%s« für Argument {%u} sind nicht identisch" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "Formatelemente in »msgid« und »%s« sind nicht gleichbedeutend" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "Formatelemente in »%s« sind keine Untermenge von deren in »msgid«" # CHECKIT -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -285,7 +285,7 @@ msgid "" msgstr "" "Formatelemente in »msgid« erwarten ein Mapping, die in »%s« jedoch ein Tuple" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -294,30 +294,30 @@ msgstr "" "Formatelemente in »msgid« erwarten ein Tuple, die in »%s« jedoch ein\n" "Mapping" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "ein Formatelement für Argument »%s«, wie in »%s«, fehlt in »msgid«" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "ein Formatelement für Argument »%s« fehlt in »%s«" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" "Formatelemente in »msgid« und »%s« für Argument »%s« stimmen nicht überein" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -329,33 +329,33 @@ msgstr "" "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n" "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Geschrieben von %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "Argumente fehlen" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -365,12 +365,12 @@ msgstr "" "oder: %s [OPTION] -s [SCHLÜSSEL]...\n" # CHECKIT -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Übersetzung einer textuellen Meldung in einer nativen Sprache anzeigen.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -391,7 +391,7 @@ msgstr "" " [TEXTBEREICH] SCHLÜSSEL die Übersetzung zu SCHLÜSSEL aus TEXTBEREICH\n" " anfordern\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -414,28 +414,28 @@ msgstr "" "\n" "Standardverzeichnis: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" "Fehler bitte (auf Englisch) an melden.\n" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Aufruf: %s [OPTION]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Rechnernamen (Hostname) ausgeben.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -450,9 +450,9 @@ msgstr "" " vollqualifizierten Domainnamen (FQDN) und Aliasse\n" " -i, --ip-address Adressen für den Rechnernamen\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -463,32 +463,32 @@ msgstr "" " -h, --help diese Hilfe anzeigen und beenden\n" " -V, --version Versionsnummer anzeigen und beenden\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "höchstens eine Eingabedatei erlaubt" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s und %s schließen sich gegenseitig aus" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -497,9 +497,9 @@ msgstr "" "Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n" "Attribute der Meldungen bearbeiten.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" @@ -507,7 +507,7 @@ msgstr "" "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n" "notwendig.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -521,8 +521,8 @@ msgstr "" "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -535,7 +535,7 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "wenn »-« angegeben ist.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -554,7 +554,7 @@ msgstr "" " --no-obsolete obsolete Meldungen (#~) verwerfen\n" " --only-obsolete obsolete Meldungen (#~) übernehmen\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -573,7 +573,7 @@ msgstr "" " --fuzzy Synonym für »--only-fuzzy --clear-fuzzy«\n" " --obsolete Synonym für »--only-obsolete --clear-obsolete«\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -607,12 +607,12 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erstellen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Auswahlkriterium nicht möglich (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n" @@ -642,7 +642,7 @@ msgstr "" "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n" "kumuliert.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -657,7 +657,7 @@ msgstr "" " -D, --directory=VERZ VERZ der Liste der Eingabedateien hinzufügen\n" "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -732,7 +732,7 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erstellen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -743,20 +743,20 @@ msgstr "" " -h, --help diese Hilfe anzeigen und beenden\n" " -V, --version Versionsnummer anzeigen und beenden\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "keine Eingabedateien angegeben" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "es werden genau zwei Eingabedateien benötigt" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -776,7 +776,7 @@ msgstr "" "geben.\n" "\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -790,7 +790,7 @@ msgstr "" " -D, --directory=VERZEICHNIS VERZEICHNIS der Liste hinzufügen, in dem nach\n" " Eingabedateien gesucht werden soll\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -799,43 +799,35 @@ msgstr "" "Optionen, die Verarbeitungen modifizieren:\n" " -m, --multi-domain Ref.pot auf jeden Bereich in Def.po anwenden\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "diese Meldung kommt vor, ist aber nicht definiert..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...diese Definition ist ähnlich" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "Warnung: diese Meldung kommt nicht vor" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "es ist %d fataler Fehler aufgetreten" msgstr[1] "es sind %d fatale Fehler aufgetreten" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "Mehrfachdefinition der Meldung" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...dies ist die Stelle der ersten Definition" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "es müssen mindestens zwei Dateien angegeben werden" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -857,7 +849,7 @@ msgstr "" "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n" "kumuliert.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -877,7 +869,7 @@ msgstr "" " -u, --unique Abkürzung für »--less-than=2«; Meldungen\n" " anfordern, die nur einmal vorkommen\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -932,7 +924,7 @@ msgstr "" " -t, --to-code=NAME Kodierung für die Ausgabe\n" "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -967,11 +959,11 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erstellen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "Eingabedatei fehlt" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "es wird genau eine Eingabedatei benötigt" @@ -1006,16 +998,16 @@ msgstr "" " -D, --directory=VERZ VERZ der Liste der Eingabedateien hinzufügen\n" "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "Name des Befehls fehlt" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Aufruf: %s [OPTION] BEFEHL [BEFEHL-OPTION]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -1031,7 +1023,7 @@ msgstr "" "Ausgabe wird zur Ausgabe von »msgexec«. Der Rückgabewert von »msgexec« ist der\n" "höchste Rückgabewert von allen Aufrufen.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -1041,7 +1033,7 @@ msgstr "" "von einem Nullbyte-Zeichen. Die Ausgabe von »msgexec 0« ist geeignet als\n" "Eingabe für »xargs -0«.\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -1055,34 +1047,34 @@ msgstr "" "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "Schreiben nach Standardausgabe fehlgeschlagen" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "Schreiben zum Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "Name des Filters fehlt" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "es muss mindestens ein sed-Skript angegeben werden" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen anwenden.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1092,7 +1084,7 @@ msgstr "" "Standardeingabe liest und die geänderte Übersetzung nach der Standardausgabe\n" "schreibt.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1107,7 +1099,7 @@ msgstr "" " Befehlen hinzufügen\n" " -n, --quiet, --silent \"Pattern-Space\" nicht automatisch ausgeben\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1143,86 +1135,86 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erstellen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "es ist nicht möglich, eine nicht-blockierende Ein/Ausgabe zum Subprozess %s\n" "zu setzen" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "Lesen vorm Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "Subprozess %s wurde mit dem Exitcode %d beendet" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "das Argument für %s sollte ein einfaches Punktzeichen sein" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s erfordert eine Angabe in der Art »-l Lokale«" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s ist nur mit %s gültig" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s ist nur mit %s oder %s gültig" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d übersetzte Meldung" msgstr[1] "%d übersetzte Meldungen" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d ungenaue Übersetzung" msgstr[1] ", %d ungenaue Übersetzungen" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d unübersetzte Meldung" msgstr[1] ", %d unübersetzte Meldungen" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Aufruf: %s [OPTION] Datei.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1235,7 +1227,7 @@ msgstr "" " -D, --directory=VERZ VERZ der Liste der Eingabedateien hinzufügen\n" "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1249,7 +1241,7 @@ msgstr "" " --java2 wie --java, aber Java2 (JDK 1.2 oder höher) annehmen\n" " --tcl Tcl-Modus: eine tcl/msgcat .msg-Datei erstellen\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1263,7 +1255,7 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "»-« angegeben ist.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1285,7 +1277,7 @@ msgstr "" "»-d« ist notwendig. Die Klasse wird unter dem angegebenen Verzeichnis\n" "geschrieben.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1302,7 +1294,7 @@ msgstr "" "Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei wird in das\n" "angegebene Verzeichnis geschrieben.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1330,7 +1322,7 @@ msgstr "" " für Menüeinträge überprüfen\n" " -f, --use-fuzzy auch ungenaue Übersetzungen (»fuzzy«) verwenden\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1342,7 +1334,7 @@ msgstr "" " ausrichten\n" " --no-hash Binärdatei soll keine Hash-Tabelle enthalten\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1357,24 +1349,24 @@ msgstr "" " --statistics Statistik zu den Übersetzungen anzeigen\n" " -v, --verbose mehr Hinweise während der Verarbeitung geben\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "Pluralausdruck kann negative Werte ergeben" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu, aber Pluralausdruck kann Werte so groß wie %lu ergeben" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "Pluralausdruck kann Teilung durch Null ergeben" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "Pluralausdruck kann einen Ganzzahl-Überlauf ergeben" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1383,51 +1375,51 @@ msgstr "" "Teilung\n" "durch Null" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "ungültige Pluralwerte" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "ungültiger Pluralausdruck" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "... aber einige Meldungen haben nur eine Pluralform" msgstr[1] "... aber einige Meldungen haben nur %lu Pluralformen" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "... aber einige Meldungen haben eine Pluralform" msgstr[1] "... aber einige Meldungen haben %lu Pluralformen" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Bitte das Folgende versuchen; gültig für %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1436,127 +1428,135 @@ msgstr "" "Kopfeintrag fehlt die Zeile:\n" "»Plural-Forms: nplurals=GANZZAHL; plural=AUSDRUCK;«" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "»msgid«- und »msgstr_plural«-Eintrag beginnen nicht jeweils mit »\\n«" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "»msgid«- und »msgstr[%u]«-Eintrag beginnen nicht jeweils mit »\\n«" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "»msgid«- und »msgstr«-Eintrag beginnen nicht jeweils mit »\\n«" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "»msgid«- und »msgstr_plural«-Eintrag enden nicht jeweils mit »\\n«" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "»msgid«- und »msgstr[%u]«-Eintrag enden nicht jeweils mit »\\n«" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "»msgid«- und »msgstr«-Eintrag enden nicht jeweils mit »\\n«" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "»%s« ist ein ungültiges Formatelement %s, im Gegensatz zu »msgid«" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "Im Kopfeintrag fehlt das Feld »%s«\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "Feld »%s« hat immer noch den anfänglichen Vorgabewert\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n" # = Konvertierung der Meldung in Hinblick auf den Zeichensatz # 2001-03-11 20:56:03 CET -ke- -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet." -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "»domain %s«-Anweisung wird ignoriert" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "Mehrfachdefinition der Meldung" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...dies ist die Stelle der ersten Definition" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "leerer »msgstr«-Eintrag wird ignoriert" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ungenauer »msgstr«-Eintrag wird ignoriert" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "Option »%c« kann nicht verwendet werden, bevor »K« or »T« festgelegt ist" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1567,7 +1567,7 @@ msgstr "" # To avoid confusion, let msgid and msgstr untranslated here! # 2001-11-04 11:16:55 CET -ke- -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1632,7 +1632,7 @@ msgstr "" " -f, --file=FILE MUSTER der DATEI entnehmen\n" " -i, --ignore-case Groß-/Kleinschreibung nicht unterscheiden\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1667,11 +1667,11 @@ msgstr "" " --sort-output sortierte Ausgabe erstellen\n" " --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "Schreiben zum Subprozess grep fehlgeschlagen" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1682,7 +1682,7 @@ msgstr "" "beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen " "können.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1693,12 +1693,12 @@ msgstr "" "Bitte legen Sie die Lokale mit der Option »--locale« oder\n" "die .po-Datei für die Ausgabe mit der Option »--output-file« fest.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "%s wurde erstellt.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1707,7 +1707,7 @@ msgstr "" "Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n" "Benutzers initialisieren.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1721,7 +1721,7 @@ msgstr "" "POT-Datei gesucht. Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1735,7 +1735,7 @@ msgstr "" "»--locale« oder von den Lokale-Einstellungen des Benutzers ab.\n" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben ist.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1753,7 +1753,7 @@ msgstr "" " Breite der Ausgabe sind, nicht auf mehrere\n" " Zeilen umbrechen\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1761,11 +1761,11 @@ msgstr "" "Mehr als eine .pot-Datei gefunden.\n" "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "Fehler beim Lesen des aktuellen Verzeichnisses" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1773,23 +1773,23 @@ msgstr "" "Keine .pot-Datei im aktuellen Verzeichnis gefunden.\n" "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() fehlgeschlagen" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "Subprozess %s mit Ein-/Ausgabefehler" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "Subprozess %s mit dem Exitcode %d fehlgeschlagen" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1806,29 +1806,29 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "German messages for %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "der Zeichensatz »%s« bezeichnet keine portable Kodierung" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" "bei Eingabedatei »%s« fehlt der Kopfeintrag mit der Angabe des Zeichensatzes" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1837,17 +1837,17 @@ msgstr "" "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n" "Zeichensatzes" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "Warnung: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1855,7 +1855,7 @@ msgstr "" "Eingabedateien enthalten Meldungen in unterschiedlichen Kodierungen (u. a.\n" "UTF-8). Die Ausgabe wird nach UTF-8 konvertiert.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1869,7 +1869,7 @@ msgstr "" "bitte\n" "die Option --to-code.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1882,12 +1882,12 @@ msgstr "" "Ausgabe von '%s' könnte nicht korrekt sein.\n" "Mögliche Abhilfen:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1898,7 +1898,7 @@ msgstr "" " dann '%s' anwenden,\n" " dann nach »%s« mittels 'msgconv' zurück konvertieren.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1911,7 +1911,7 @@ msgstr "" " dann '%s' anwenden,\n" " dann nach »%s« mittels 'msgconv' zurück konvertieren.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1922,16 +1922,16 @@ msgstr "" "Ausgabe von '%s' könnte nicht korrekt sein.\n" "Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "Fehler bei der Konvertierung" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1940,7 +1940,7 @@ msgstr "" "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n" "%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1949,11 +1949,11 @@ msgstr "" "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n" "%s hängt von iconv() ab. Diese Version wurde ohne iconv() erstellt." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "Art der Sicherung" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1977,7 +1977,7 @@ msgstr "" "exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n" "versucht, ein besseres Ergebnis zu erzielen.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1995,7 +1995,7 @@ msgstr "" " -C, --compendium=DATEI zusätzliche Bibliothek mit Übersetzungen, es\n" " können mehrere angegeben werden\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -2006,7 +2006,7 @@ msgstr "" " -U, --update Def.po aktualisieren; nichts unternehmen,\n" " wenn Def.po bereits aktuell ist\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -2039,7 +2039,7 @@ msgstr "" "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n" "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -2054,15 +2054,15 @@ msgstr "" " -v, --verbose mehr Hinweise während der Verarbeitung geben\n" " -q, --quiet, --silent Fortschrittsanzeige unterdrücken\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "diese Meldung sollte Pluralformen definieren" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "diese Meldung sollte keine Pluralformen definieren" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2071,11 +2071,11 @@ msgstr "" "%s%ld alte + %ld Referenzeinträge gelesen,\n" "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " fertig.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s und explizite Angabe des Dateinamens schließen sich gegenseitig aus" @@ -2240,13 +2240,13 @@ msgstr "" " -u, --unique nur nicht-doppelte Einträge ausgeben, doppelte\n" " verwerfen\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Aufruf: %s [OPTION] [TEXTBEREICH] SCHLÜSSEL SCHLÜSSEL-PLURAL ZAHL\n" # CHECKIT -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2255,7 +2255,7 @@ msgstr "" "Übersetzung einer textuellen Meldung, deren grammatische Form von einer Zahl\n" "abhängt, in einer nativen Sprache anzeigen.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2278,7 +2278,7 @@ msgstr "" " ZAHL Singular-/Pluralform anhand des Wertes ZAHL\n" " wählen\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2294,17 +2294,17 @@ msgstr "" "\n" "Standardverzeichnis: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: Warnung: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2314,15 +2314,15 @@ msgstr "" "Konvertierung der Meldungen in den Zeichensatz des Anwenders\n" "könnte fehlschlagen.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Gleichwohl Fortsetzung; Parsing-Fehler sind zu erwarten." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Gleichwohl Fortsetzung." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2331,7 +2331,7 @@ msgstr "" "Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab,\n" "und iconv() unterstützt »%s« nicht.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2339,12 +2339,12 @@ msgstr "" "Dieses Problem lässt sich beheben, wenn Sie GNU libiconv installieren\n" "und dann GNU gettext erneut installieren.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2353,7 +2353,7 @@ msgstr "" "Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab.\n" "Diese Version wurde ohne iconv() erstellt.\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2387,79 +2387,79 @@ msgid "plural form has wrong index" msgstr "Pluralform hat einen falschen Index" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "zu viele Fehler: Abbruch" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "ungültige Multibyte-Sequenz" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "ungültige Multibyte-Sequenz am Ende der Datei" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "ungültige Multibyte-Sequenz am Ende der Zeile" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "Fehler von iconv" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "Fehler beim Lesen von »%s«" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "Schlüsselwort »%s« ist unbekannt" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ungültige Kontrollsequenz" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "Dateiende innerhalb einer Zeichenkette" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "Zeilenende innerhalb einer Zeichenkette" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "Datei »%s« ist verstümmelt" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "Datei »%s« hat eine nicht mit NUL terminierte Zeichenkette" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "Datei »%s« ist nicht im GNU .mo-Format" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "Datei »%s« hat bei %s eine nicht mit NUL terminierte Zeichenkette" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "zwei Argumente werden erwartet" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Aufruf: %s [OPTION] URL DATEI\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2468,55 +2468,55 @@ msgstr "" "URL holen und Inhalt ausgeben. Wenn auf den URL nicht zugegriffen werden kann,\n" "wird die lokal zugängliche Datei stattdessen verwendet.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "Fehler beim Schreiben von Standardausgabe" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "temporäres Verzeichnis ist nicht zu finden; bitte setzen Sie $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "" "es ist nicht möglich, ein temporäres Verzeichnis mittels\n" "der Vorlage »%s« anzulegen" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "kein gültiger Name einer Java-Klasse: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "Fehler beim Anlegen von »%s«" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "Fehler beim Schreiben von Datei »%s«" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n" "--verbose oder setzen Sie $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "Fehler beim Öffnen von »%s« zum Schreiben" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2532,68 +2532,68 @@ msgstr "" "msgid mit reinen ASCII-Zeichen aus.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "Ausgabedatei »%s« kann nicht erstellt werden" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "Standardausgabe" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "diese Datei darf keine »domain«-Anweisung enthalten" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: ungültige Definition einer Zeichenkette" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: Zahl nach # fehlt" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n" "geschrieben wird" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2602,7 +2602,7 @@ msgstr "" "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n" "notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2618,14 +2618,14 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "»-« angegeben ist.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2638,7 +2638,16 @@ msgstr "" "Gemäß Vorgabe wird die Sprache anhand des Suffixes des Namens der Eingabedatei\n" "geraten.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2653,7 +2662,7 @@ msgstr "" " -c, --add-comments[=KENNUNG] Kommentare mit KENNUNG (oder die aus Zeilen\n" " vor einem Schlüsselwort) herausschreiben\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2673,7 +2682,7 @@ msgstr "" " --debug detaillierteres Ergebnis bei Erkennung der\n" " Formatelemente\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2719,11 +2728,18 @@ msgstr "" " -m, --msgstr-prefix[=KETTE] KETTE oder \"\" als Präfix für msgstr nehmen\n" " -M, --msgstr-suffix[=KETTE] KETTE oder \"\" als Suffix für msgstr nehmen\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "Standardeingabe" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2733,7 +2749,7 @@ msgstr "" "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n" "zurück, keine leere Zeichenkette.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "Programmiersprache »%s« unbekannt" diff --git a/po/el.gmo b/po/el.gmo index 7f3a7b93d..6282a06ad 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 9b85b7206..6b940b7ea 100644 --- a/po/el.po +++ b/po/el.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.34\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 1998-05-17 13:12+0200\n" "Last-Translator: Simos KSenitellis \n" "Language-Team: Greek \n" @@ -14,193 +14,193 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" # -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç" # -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ" # -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\"" # -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\"" # -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\"" # -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" # -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n" # -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ðáñÜìåôñï\n" # -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ðáñÜìåôñï\n" # -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n" # -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n" # -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n" # -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n" # -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n" # -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ç åðéëïãÞ áðáéôåß ðáñÜìåôñï -- %c\n" # -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n" # -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" # -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 #, fuzzy msgid "memory exhausted" msgstr "H ìíÞìç åîáíôëÞèçêå" # -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" # -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé" # -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -208,33 +208,33 @@ msgid "" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé" # -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -243,7 +243,7 @@ msgstr "" "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé" # -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -252,7 +252,7 @@ msgstr "" "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé" # -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -260,24 +260,24 @@ msgid "" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -290,49 +290,49 @@ msgstr "" "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n" # -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n" # -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "ðÜñá ðïëëÜ ïñßóìáôá" # -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "õðïëåßðïíôáé ïñßóìáôá" # -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" # -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -356,7 +356,7 @@ msgstr "" " óôï MSGID áðü ôï TEXTDOMAIN\n" # -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -378,26 +378,26 @@ msgstr "" "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n" # -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -407,9 +407,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -417,48 +417,48 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" # -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -467,8 +467,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -477,7 +477,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -489,7 +489,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -502,7 +502,7 @@ msgid "" msgstr "" # -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -540,12 +540,12 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -581,7 +581,7 @@ msgstr "" "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n" "èá äéáôçñçèïýí.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -591,7 +591,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -671,7 +671,7 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -680,22 +680,22 @@ msgid "" msgstr "" # -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ" # -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" # -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -721,7 +721,7 @@ msgstr "" "Ý÷ïõí ìåôáöñáóôåß. Åêåß ðïõ äåí åíôïðßæåôáé áêñéâÞò áíôéóôoé÷ßá,\n" "ãßíåôáé åëáóôéêü ôáßñéáóìá ãéá êáëýôåñá áðïôåëÝóìáôá.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -730,7 +730,7 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -738,50 +738,40 @@ msgid "" msgstr "" # -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..." # -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò" # -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé" # -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá" # -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò" - -# -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý" - -# -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá" # -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -811,7 +801,7 @@ msgstr "" "èá äéáôçñçèïýí.\n" # -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -841,7 +831,7 @@ msgstr "" "èá äéáôçñçèïýí.\n" # -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -893,7 +883,7 @@ msgid "" msgstr "" # -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -931,12 +921,12 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ" # -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ" @@ -965,17 +955,17 @@ msgid "" msgstr "" # -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "õðïëåßðïíôáé ïñßóìáôá" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -985,14 +975,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -1001,45 +991,45 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" # -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "õðïëåßðïíôáé ïñßóìáôá" # -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1050,7 +1040,7 @@ msgid "" msgstr "" # -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1088,84 +1078,84 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" # -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, fuzzy, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá" # -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, fuzzy, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò" # -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, fuzzy, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1174,7 +1164,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1183,7 +1173,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1192,7 +1182,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1204,7 +1194,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1214,7 +1204,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1230,7 +1220,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1238,7 +1228,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1248,58 +1238,58 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" # -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" # -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1307,134 +1297,134 @@ msgstr[0] " msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" # -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'" # -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'" # -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'" # -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'" # -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'" # -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" # -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá" # -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò" # -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ" # -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ" # -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" # -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" # -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" # -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ" # -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" @@ -1442,41 +1432,51 @@ msgstr "" "ãßíåé ÷ñÞóç ðñïèÝìáôïò" # -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "ç ïäçãßá `domain %s' áãíïåßôáé" # -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò" + +# +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý" + +# +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé" # -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé" # -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1508,7 +1508,7 @@ msgid "" msgstr "" # -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1545,18 +1545,18 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1564,19 +1564,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1585,7 +1585,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1594,7 +1594,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1605,39 +1605,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1649,51 +1649,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1702,7 +1702,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1711,12 +1711,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1724,7 +1724,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1733,7 +1733,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1741,34 +1741,34 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" # -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1794,7 +1794,7 @@ msgstr "" "Ôá áðïôåëÝóìáôá ãñÜöïíôáé óôçí êáíïíéêÞ Ýîïäï åêôüò êáé áí ïñßæåôáé\n" "êÜðïéï áñ÷åßï åîüäïõ.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1805,7 +1805,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1813,7 +1813,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1830,7 +1830,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1841,19 +1841,19 @@ msgid "" msgstr "" # -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1863,12 +1863,12 @@ msgstr "" "Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n" # -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " Ýãéíå.\n" # -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá" @@ -1982,12 +1982,12 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -1995,7 +1995,7 @@ msgid "" msgstr "" # -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2019,7 +2019,7 @@ msgstr "" " óôï MSGID áðü ôï TEXTDOMAIN\n" # -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2037,18 +2037,18 @@ msgstr "" "Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n" "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" # -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, fuzzy, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2056,33 +2056,33 @@ msgid "" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2090,7 +2090,7 @@ msgid "" msgstr "" # -#: src/po-charset.c:338 +#: src/po-charset.c:337 #, fuzzy msgid "" "Charset missing in header.\n" @@ -2129,97 +2129,97 @@ msgstr "" # #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù" # -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 #, fuzzy msgid "invalid multibyte sequence" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" # -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" # -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" # -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\"" # -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "Üãíùóôç åíôïëÞ \"%s\"" # -#: src/po-lex.c:935 +#: src/po-lex.c:856 #, fuzzy msgid "invalid control sequence" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" # -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "ôÝëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü" # -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü" # -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïýí äåäïìÝíá óå áõôü" # -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo" # -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo" # -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo" # -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "ðÜñá ðïëëÜ ïñßóìáôá" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2227,49 +2227,49 @@ msgid "" msgstr "" # -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" # -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" # -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" # -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ" # -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2277,7 +2277,7 @@ msgstr "" "ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%" "c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2287,80 +2287,80 @@ msgid "" msgstr "" # -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\"" # -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "êáíïíéêÞ Ýîïäïò" # -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí" # -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü" # -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" # -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí " "êáíïíéêÞ Ýîïäï" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" # -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2370,19 +2370,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2392,7 +2401,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2404,7 +2413,7 @@ msgid "" msgstr "" # -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2447,11 +2456,18 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "êáíïíéêÞ åßóïäïò" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2459,11 +2475,16 @@ msgid "" msgstr "" # -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç" +# +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo" + # #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "ç ðñüóâáóç óôï áñ÷åßï \"%s\", èÝóç %ld, áðÝôõ÷å" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo index 019f00e9e..f63e351d9 100644 Binary files a/po/en@boldquot.gmo and b/po/en@boldquot.gmo differ diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 470c01210..74f5c5616 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for GNU gettext package. -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU gettext package. -# Automatically generated, 2002. +# Automatically generated, 2003. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,9 +30,9 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU gettext 0.11.4\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" -"PO-Revision-Date: 2002-07-23 15:23+0200\n" +"Project-Id-Version: GNU gettext 0.11.6-pre2\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" +"PO-Revision-Date: 2003-01-08 14:39+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -40,149 +40,149 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "invalid argument ‘%s’ for ‘%s’" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "ambiguous argument ‘%s’ for ‘%s’" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Valid arguments are:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error while opening “%s” for reading" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "cannot open backup file “%s” for writing" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "error reading “%s”" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "error writing “%s”" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "error after reading “%s”" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Unknown system error" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s subprocess failed" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn't allow an argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: option ‘%c%s’ doesn't allow an argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: option ‘%s’ requires an argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: illegal option -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: invalid option -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: option requires an argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: option ‘-W %s’ doesn't allow an argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Java compiler not found, try installing gcj or set $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "Java virtual machine not found, try installing gij or set $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "memory exhausted" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "cannot create pipe" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s subprocess" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s subprocess got fatal signal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "number of format specifications in ‘msgid’ and ‘%s’ does not " "match" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" @@ -190,8 +190,8 @@ msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument %u are " "not the same" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -199,13 +199,13 @@ msgstr "" "a format specification for argument %u, as in '%s', doesn't exist in " "‘msgid’" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "a format specification for argument %u doesn't exist in ‘%s’" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -214,12 +214,12 @@ msgstr "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "‘msgid’" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "a format specification for argument {%u} doesn't exist in ‘%s’" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" @@ -227,20 +227,20 @@ msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument {%u} are " "not the same" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "format specifications in ‘msgid’ and ‘%s’ are not equivalent" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "format specifications in ‘%s’ are not a subset of those in ‘msgid" "[0m’" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -249,7 +249,7 @@ msgstr "" "format specifications in ‘msgid’ expect a mapping, those in ‘%s’ " "expect a tuple" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -258,7 +258,7 @@ msgstr "" "format specifications in ‘msgid’ expect a tuple, those in ‘%s’ " "expect a mapping" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -267,13 +267,13 @@ msgstr "" "a format specification for argument '%s', as in '%s', doesn't exist in " "‘msgid’" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "" "a format specification for argument ‘%s’ doesn't exist in ‘%s’" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -281,11 +281,11 @@ msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s" "[0m’ are not the same" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -296,33 +296,33 @@ msgstr "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "too many arguments" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "missing arguments" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -331,12 +331,12 @@ msgstr "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Display native language translation of a textual message.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -357,7 +357,7 @@ msgstr "" " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -378,25 +378,25 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Print the machine's hostname.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -411,9 +411,9 @@ msgstr "" " and aliases\n" " -i, --ip-address addresses for the hostname\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -424,32 +424,32 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "could not get host name" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "at most one input file allowed" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s and %s are mutually exclusive" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [INPUTFILE]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -458,15 +458,15 @@ msgstr "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Mandatory arguments to long options are mandatory for short options too.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -479,8 +479,8 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -493,7 +493,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -512,7 +512,7 @@ msgstr "" " --no-obsolete remove obsolete #~ messages\n" " --only-obsolete keep obsolete #~ messages\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -531,7 +531,7 @@ msgstr "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" " --obsolete synonym for --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -562,12 +562,12 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "impossible selection criteria specified (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [INPUTFILE]...\n" @@ -595,7 +595,7 @@ msgstr "" "is specified, they will be taken from the first PO file to define them.\n" "File positions from all PO files will be cumulated.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -610,7 +610,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -681,7 +681,7 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -692,20 +692,20 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "no input files given" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "exactly 2 input files required" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -722,7 +722,7 @@ msgstr "" "you have translated each and every message in your program. Where an exact\n" "match cannot be found, fuzzy matching is used to produce better diagnostics.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -735,7 +735,7 @@ msgstr "" " ref.pot references to the sources\n" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -744,43 +744,35 @@ msgstr "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "this message is used but not defined..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...but this definition is similar" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "this message is used but not defined in %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "warning: this message is not used" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "found %d fatal error" msgstr[1] "found %d fatal errors" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "duplicate message definition" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...this is the location of the first definition" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "at least two files must be specified" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -801,7 +793,7 @@ msgstr "" "PO file to define them. File positions from all PO files will be\n" "cumulated.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -822,7 +814,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -871,7 +863,7 @@ msgstr "" " -t, --to-code=NAME encoding for output\n" "The default encoding is the current locale's encoding.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -902,11 +894,11 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "no input file given" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "exactly one input file required" @@ -941,16 +933,16 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "missing command name" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -965,7 +957,7 @@ msgstr "" "msgexec's output. msgexec's return code is the maximum return code\n" "across all invocations.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -974,7 +966,7 @@ msgstr "" "A special builtin command called ‘0’ outputs the translation, followed by a\n" "null byte. The output of “msgexec 0” is suitable as input for “xargs -0”.\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -987,34 +979,34 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "write to stdout failed" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "write to %s subprocess failed" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "missing filter name" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "at least one sed script must be specified" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Applies a filter to all translations of a translation catalog.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1023,7 +1015,7 @@ msgstr "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1038,7 +1030,7 @@ msgstr "" " to be executed\n" " -n, --quiet, --silent suppress automatic printing of pattern space\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1071,84 +1063,84 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "cannot set up nonblocking I/O to %s subprocess" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "communication with %s subprocess failed" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "read from %s subprocess failed" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s subprocess terminated with exit code %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "the argument to %s should be a single punctuation character" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requires a “-d directory” specification" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requires a “-l locale” specification" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s is only valid with %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s is only valid with %s or %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d translated message" msgstr[1] "%d translated messages" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d fuzzy translation" msgstr[1] ", %d fuzzy translations" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d untranslated message" msgstr[1] ", %d untranslated messages" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Usage: %s [OPTION] filename.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Generate binary message catalog from textual translation description.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1161,7 +1153,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1174,7 +1166,7 @@ msgstr "" " --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1187,7 +1179,7 @@ msgstr "" " --strict enable strict Uniforum mode\n" "If output file is -, output is written to standard output.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1206,7 +1198,7 @@ msgstr "" "separated with an underscore. The -d option is mandatory. The class is\n" "written under the specified directory.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1221,7 +1213,7 @@ msgstr "" "The -l and -d options are mandatory. The .msg file is written in the\n" "specified directory.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1248,7 +1240,7 @@ msgstr "" " menu items\n" " -f, --use-fuzzy use fuzzy entries in output\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1259,7 +1251,7 @@ msgstr "" " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n" " --no-hash binary file will not include the hash table\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1274,25 +1266,25 @@ msgstr "" " --statistics print statistics about translations\n" " -v, --verbose increase verbosity level\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "plural expression can produce negative values" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu but plural expression can produce values as large as %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "plural expression can produce division by zero" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "plural expression can produce integer overflow" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1300,51 +1292,51 @@ msgstr "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "message catalog has plural form translations..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...but header entry lacks a “plural=EXPRESSION” attribute" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...but header entry lacks a “nplurals=INTEGER” attribute" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "invalid nplurals value" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "invalid plural expression" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...but some messages have only one plural form" msgstr[1] "...but some messages have only %lu plural forms" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...but some messages have one plural form" msgstr[1] "...but some messages have %lu plural forms" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Try using the following, valid for %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1352,131 +1344,139 @@ msgstr "" "message catalog has plural form translations, but lacks a header entry with " "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n" "[0m’" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "" "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n" "[0m’" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "" "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n" "[0m’" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "" "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "" "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "plural handling is a GNU gettext extension" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "‘%s’ is not a valid %s format string, unlike ‘msgid’" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr lacks the keyboard accelerator mark ‘%c’" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr has too many keyboard accelerator marks ‘%c’" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "headerfield ‘%s’ missing in header\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "header field ‘%s’ should start at beginning of line\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "some header fields still have the initial default value\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "field ‘%s’ still has initial default value\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "warning: PO file header missing or invalid\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "warning: charset conversion will not work\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "warning: PO file header fuzzy\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "warning: older versions of msgfmt will give an error on this\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domain name “%s” not suitable as file name" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domain name “%s” not suitable as file name: will use prefix" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "‘domain %s’ directive ignored" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "duplicate message definition" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...this is the location of the first definition" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "empty ‘msgstr’ entry ignored" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "fuzzy ‘msgstr’ entry ignored" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: warning: source file contains fuzzy translation" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "option ‘%c’ cannot be used before ‘K’ or ‘T’ has been " "specified" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1485,7 +1485,7 @@ msgstr "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1542,7 +1542,7 @@ msgstr "" " -f, --file=FILE obtain PATTERN from FILE\n" " -i, --ignore-case ignore case distinctions\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1573,11 +1573,11 @@ msgstr "" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "write to grep subprocess failed" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1587,7 +1587,7 @@ msgstr "" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1598,12 +1598,12 @@ msgstr "" "Please specify the locale through the --locale option or\n" "the output .po file through the --output-file option.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Created %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1612,7 +1612,7 @@ msgstr "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1625,7 +1625,7 @@ msgstr "" "If no input file is given, the current directory is searched for the POT file.\n" "If it is -, standard input is read.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1638,7 +1638,7 @@ msgstr "" "If no output file is given, it depends on the --locale option or the user's\n" "locale setting. If it is -, the results are written to standard output.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1655,7 +1655,7 @@ msgstr "" " --no-wrap do not break long message lines, longer than\n" " the output page width, into several lines\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1663,11 +1663,11 @@ msgstr "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "error reading current directory" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1675,23 +1675,23 @@ msgstr "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() failed" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s subprocess I/O error" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s subprocess failed with exit code %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1708,22 +1708,22 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "English translations for %s package" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "present charset “%s” is not a portable encoding name" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "two different charsets “%s” and “%s” in input file" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" @@ -1731,7 +1731,7 @@ msgstr "" "input file ‘%s’ doesn't contain a header entry with a charset " "specification" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1740,17 +1740,17 @@ msgstr "" "domain “%s” in input file ‘%s’ doesn't contain a header entry " "with a charset specification" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "target charset “%s” is not a portable encoding name." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "warning: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1758,7 +1758,7 @@ msgstr "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1771,7 +1771,7 @@ msgstr "" "Converting the output to UTF-8.\n" "To select a different output encoding, use the --to-code option.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1784,12 +1784,12 @@ msgstr "" "Output of ‘%s’ might be incorrect.\n" "Possible workarounds are:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Set LC_ALL to a locale with encoding %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1800,7 +1800,7 @@ msgstr "" " then apply '%s',\n" " then convert back to %s using 'msgconv'.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1813,7 +1813,7 @@ msgstr "" " then apply '%s',\n" " then convert back to %s using 'msgconv'.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1824,15 +1824,15 @@ msgstr "" "Output of ‘%s’ might be incorrect.\n" "A possible workaround is to set LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "conversion failure" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "input file doesn't contain a header entry with a charset specification" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1841,7 +1841,7 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv" "() does not support this conversion." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1850,11 +1850,11 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(). This " "version was built without iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "backup type" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1877,7 +1877,7 @@ msgstr "" "comments and file positions will be preserved. Where an exact match\n" "cannot be found, fuzzy matching is used to produce better results.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1894,7 +1894,7 @@ msgstr "" " -C, --compendium=FILE additional library of message translations,\n" " may be specified more than once\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1905,7 +1905,7 @@ msgstr "" " -U, --update update def.po,\n" " do nothing if def.po already up to date\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1934,7 +1934,7 @@ msgstr "" "The backup suffix is ‘~’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1949,15 +1949,15 @@ msgstr "" " -v, --verbose increase verbosity level\n" " -q, --quiet, --silent suppress progress indicators\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "this message should define plural forms" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "this message should not define plural forms" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1966,11 +1966,11 @@ msgstr "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s and explicit file names are mutually exclusive" @@ -2120,12 +2120,12 @@ msgstr "" " -d, --repeated print only duplicates\n" " -u, --unique print only unique messages, discard duplicates\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2134,7 +2134,7 @@ msgstr "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2155,7 +2155,7 @@ msgstr "" " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n" " COUNT choose singular/plural form based on this value\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2170,17 +2170,17 @@ msgstr "" "variable TEXTDOMAINDIR.\n" "Standard search directory: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: warning: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2189,15 +2189,15 @@ msgstr "" "Charset “%s” is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Continuing anyway, expect parse errors." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Continuing anyway." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2206,7 +2206,7 @@ msgstr "" "Charset “%s” is not supported. %s relies on iconv(),\n" "and iconv() does not support “%s”.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2214,12 +2214,12 @@ msgstr "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2228,7 +2228,7 @@ msgstr "" "Charset “%s” is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2261,79 +2261,79 @@ msgid "plural form has wrong index" msgstr "plural form has wrong index" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "too many errors, aborting" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "invalid multibyte sequence" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "incomplete multibyte sequence at end of file" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "incomplete multibyte sequence at end of line" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv failure" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "error while reading “%s”" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "keyword “%s” unknown" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "invalid control sequence" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "end-of-file within string" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "end-of-line within string" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "file “%s” is truncated" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "file “%s” contains a not NUL terminated string" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "file “%s” is not in GNU .mo format" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" -msgstr "file “%s” contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" +msgstr "file “%s” contains a not NUL terminated string, at %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "expected two arguments" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Usage: %s [OPTION] URL FILE\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2342,44 +2342,44 @@ msgstr "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "error writing stdout" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "cannot find a temporary directory, try setting $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "cannot create a temporary directory using template “%s”" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "not a valid Java class name: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "failed to create “%s”" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "error while writing “%s” file" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "compilation of Java class failed, please try --verbose or set $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "error while opening “%s” for writing" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2387,7 +2387,7 @@ msgstr "" "internationalized messages should not contain the ‘\\%c’ escape " "sequence" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2400,64 +2400,64 @@ msgstr "" "different from yours. Consider using a pure ASCII msgid instead.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "cannot create output file “%s”" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard output" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: warning: unterminated character constant" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: warning: unterminated string literal" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "this file may not contain domain directives" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: invalid string definition" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: missing number after #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: invalid string expression" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing cannot be used when output is written to stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext cannot work without keywords to look for" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extract translatable strings from given input files.\n" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2466,7 +2466,7 @@ msgstr "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2481,26 +2481,39 @@ msgstr "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" "If output file is -, output is written to standard output.\n" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2515,7 +2528,7 @@ msgstr "" " -c, --add-comments[=TAG] place comment block with TAG (or those\n" " preceding keyword lines) in output file\n" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2532,7 +2545,7 @@ msgstr "" " -T, --trigraphs understand ANSI C trigraphs for input\n" " --debug more detailed formatstring recognition result\n" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2573,11 +2586,20 @@ msgstr "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2587,7 +2609,7 @@ msgstr "" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "language ‘%s’ unknown" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index 175ec1121..61e5fb5de 100644 Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ diff --git a/po/en@quot.po b/po/en@quot.po index 1351b9380..f48b57a7f 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for GNU gettext package. -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This file is distributed under the same license as the GNU gettext package. -# Automatically generated, 2002. +# Automatically generated, 2003. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,9 +27,9 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU gettext 0.11.4\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" -"PO-Revision-Date: 2002-07-23 15:23+0200\n" +"Project-Id-Version: GNU gettext 0.11.6-pre2\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" +"PO-Revision-Date: 2003-01-08 14:39+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -37,168 +37,168 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "invalid argument ‘%s’ for ‘%s’" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "ambiguous argument ‘%s’ for ‘%s’" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Valid arguments are:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error while opening “%s” for reading" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "cannot open backup file “%s” for writing" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "error reading “%s”" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "error writing “%s”" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "error after reading “%s”" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Unknown system error" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s subprocess failed" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option ‘%s’ is ambiguous\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option ‘--%s’ doesn't allow an argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: option ‘%c%s’ doesn't allow an argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: option ‘%s’ requires an argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognized option ‘--%s’\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognized option ‘%c%s’\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: illegal option -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: invalid option -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: option requires an argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option ‘-W %s’ is ambiguous\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: option ‘-W %s’ doesn't allow an argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Java compiler not found, try installing gcj or set $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "Java virtual machine not found, try installing gij or set $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "memory exhausted" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "cannot create pipe" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s subprocess" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s subprocess got fatal signal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "number of format specifications in ‘msgid’ and ‘%s’ does not match" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument %u are not the same" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "" "a format specification for argument %u, as in '%s', doesn't exist in ‘msgid’" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "a format specification for argument %u doesn't exist in ‘%s’" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -207,29 +207,29 @@ msgstr "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "‘msgid’" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "a format specification for argument {%u} doesn't exist in ‘%s’" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument {%u} are not the same" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "format specifications in ‘msgid’ and ‘%s’ are not equivalent" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "format specifications in ‘%s’ are not a subset of those in ‘msgid’" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -238,7 +238,7 @@ msgstr "" "format specifications in ‘msgid’ expect a mapping, those in ‘%s’ expect a " "tuple" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -247,7 +247,7 @@ msgstr "" "format specifications in ‘msgid’ expect a tuple, those in ‘%s’ expect a " "mapping" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -256,23 +256,23 @@ msgstr "" "a format specification for argument '%s', as in '%s', doesn't exist in " "‘msgid’" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "a format specification for argument ‘%s’ doesn't exist in ‘%s’" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s’ are not the same" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -283,33 +283,33 @@ msgstr "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "too many arguments" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "missing arguments" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -318,12 +318,12 @@ msgstr "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Display native language translation of a textual message.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -344,7 +344,7 @@ msgstr "" " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -365,25 +365,25 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Print the machine's hostname.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -398,9 +398,9 @@ msgstr "" " and aliases\n" " -i, --ip-address addresses for the hostname\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -411,32 +411,32 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "could not get host name" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "at most one input file allowed" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s and %s are mutually exclusive" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [INPUTFILE]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -445,15 +445,15 @@ msgstr "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Mandatory arguments to long options are mandatory for short options too.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -466,8 +466,8 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -480,7 +480,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -499,7 +499,7 @@ msgstr "" " --no-obsolete remove obsolete #~ messages\n" " --only-obsolete keep obsolete #~ messages\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -518,7 +518,7 @@ msgstr "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" " --obsolete synonym for --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -549,12 +549,12 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "impossible selection criteria specified (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [INPUTFILE]...\n" @@ -582,7 +582,7 @@ msgstr "" "is specified, they will be taken from the first PO file to define them.\n" "File positions from all PO files will be cumulated.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -597,7 +597,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -668,7 +668,7 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -679,20 +679,20 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "no input files given" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "exactly 2 input files required" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -709,7 +709,7 @@ msgstr "" "you have translated each and every message in your program. Where an exact\n" "match cannot be found, fuzzy matching is used to produce better diagnostics.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -722,7 +722,7 @@ msgstr "" " ref.pot references to the sources\n" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -731,43 +731,35 @@ msgstr "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "this message is used but not defined..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...but this definition is similar" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "this message is used but not defined in %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "warning: this message is not used" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "found %d fatal error" msgstr[1] "found %d fatal errors" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "duplicate message definition" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...this is the location of the first definition" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "at least two files must be specified" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -788,7 +780,7 @@ msgstr "" "PO file to define them. File positions from all PO files will be\n" "cumulated.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -809,7 +801,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -858,7 +850,7 @@ msgstr "" " -t, --to-code=NAME encoding for output\n" "The default encoding is the current locale's encoding.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -889,11 +881,11 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "no input file given" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "exactly one input file required" @@ -928,16 +920,16 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "missing command name" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -952,7 +944,7 @@ msgstr "" "msgexec's output. msgexec's return code is the maximum return code\n" "across all invocations.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -961,7 +953,7 @@ msgstr "" "A special builtin command called ‘0’ outputs the translation, followed by a\n" "null byte. The output of “msgexec 0” is suitable as input for “xargs -0”.\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -974,34 +966,34 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "write to stdout failed" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "write to %s subprocess failed" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "missing filter name" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "at least one sed script must be specified" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Applies a filter to all translations of a translation catalog.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1010,7 +1002,7 @@ msgstr "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1025,7 +1017,7 @@ msgstr "" " to be executed\n" " -n, --quiet, --silent suppress automatic printing of pattern space\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1058,84 +1050,84 @@ msgstr "" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "cannot set up nonblocking I/O to %s subprocess" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "communication with %s subprocess failed" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "read from %s subprocess failed" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s subprocess terminated with exit code %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "the argument to %s should be a single punctuation character" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requires a “-d directory” specification" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requires a “-l locale” specification" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s is only valid with %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s is only valid with %s or %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d translated message" msgstr[1] "%d translated messages" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d fuzzy translation" msgstr[1] ", %d fuzzy translations" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d untranslated message" msgstr[1] ", %d untranslated messages" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Usage: %s [OPTION] filename.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Generate binary message catalog from textual translation description.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1148,7 +1140,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1161,7 +1153,7 @@ msgstr "" " --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1174,7 +1166,7 @@ msgstr "" " --strict enable strict Uniforum mode\n" "If output file is -, output is written to standard output.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1193,7 +1185,7 @@ msgstr "" "separated with an underscore. The -d option is mandatory. The class is\n" "written under the specified directory.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1208,7 +1200,7 @@ msgstr "" "The -l and -d options are mandatory. The .msg file is written in the\n" "specified directory.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1235,7 +1227,7 @@ msgstr "" " menu items\n" " -f, --use-fuzzy use fuzzy entries in output\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1246,7 +1238,7 @@ msgstr "" " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n" " --no-hash binary file will not include the hash table\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1261,25 +1253,25 @@ msgstr "" " --statistics print statistics about translations\n" " -v, --verbose increase verbosity level\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "plural expression can produce negative values" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu but plural expression can produce values as large as %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "plural expression can produce division by zero" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "plural expression can produce integer overflow" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1287,51 +1279,51 @@ msgstr "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "message catalog has plural form translations..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...but header entry lacks a “plural=EXPRESSION” attribute" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...but header entry lacks a “nplurals=INTEGER” attribute" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "invalid nplurals value" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "invalid plural expression" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...but some messages have only one plural form" msgstr[1] "...but some messages have only %lu plural forms" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...but some messages have one plural form" msgstr[1] "...but some messages have %lu plural forms" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Try using the following, valid for %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1339,120 +1331,128 @@ msgstr "" "message catalog has plural form translations, but lacks a header entry with " "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n’" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n’" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n’" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "plural handling is a GNU gettext extension" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "‘%s’ is not a valid %s format string, unlike ‘msgid’" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr lacks the keyboard accelerator mark ‘%c’" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr has too many keyboard accelerator marks ‘%c’" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "headerfield ‘%s’ missing in header\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "header field ‘%s’ should start at beginning of line\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "some header fields still have the initial default value\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "field ‘%s’ still has initial default value\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "warning: PO file header missing or invalid\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "warning: charset conversion will not work\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "warning: PO file header fuzzy\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "warning: older versions of msgfmt will give an error on this\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domain name “%s” not suitable as file name" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domain name “%s” not suitable as file name: will use prefix" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "‘domain %s’ directive ignored" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "duplicate message definition" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...this is the location of the first definition" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "empty ‘msgstr’ entry ignored" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "fuzzy ‘msgstr’ entry ignored" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: warning: source file contains fuzzy translation" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "option ‘%c’ cannot be used before ‘K’ or ‘T’ has been specified" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1461,7 +1461,7 @@ msgstr "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1518,7 +1518,7 @@ msgstr "" " -f, --file=FILE obtain PATTERN from FILE\n" " -i, --ignore-case ignore case distinctions\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1549,11 +1549,11 @@ msgstr "" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "write to grep subprocess failed" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1563,7 +1563,7 @@ msgstr "" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1574,12 +1574,12 @@ msgstr "" "Please specify the locale through the --locale option or\n" "the output .po file through the --output-file option.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Created %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1588,7 +1588,7 @@ msgstr "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1601,7 +1601,7 @@ msgstr "" "If no input file is given, the current directory is searched for the POT file.\n" "If it is -, standard input is read.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1614,7 +1614,7 @@ msgstr "" "If no output file is given, it depends on the --locale option or the user's\n" "locale setting. If it is -, the results are written to standard output.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1631,7 +1631,7 @@ msgstr "" " --no-wrap do not break long message lines, longer than\n" " the output page width, into several lines\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1639,11 +1639,11 @@ msgstr "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "error reading current directory" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1651,23 +1651,23 @@ msgstr "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() failed" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s subprocess I/O error" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s subprocess failed with exit code %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1684,29 +1684,29 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "English translations for %s package" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "present charset “%s” is not a portable encoding name" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "two different charsets “%s” and “%s” in input file" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" "input file ‘%s’ doesn't contain a header entry with a charset specification" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1715,17 +1715,17 @@ msgstr "" "domain “%s” in input file ‘%s’ doesn't contain a header entry with a charset " "specification" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "target charset “%s” is not a portable encoding name." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "warning: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1733,7 +1733,7 @@ msgstr "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1746,7 +1746,7 @@ msgstr "" "Converting the output to UTF-8.\n" "To select a different output encoding, use the --to-code option.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1759,12 +1759,12 @@ msgstr "" "Output of ‘%s’ might be incorrect.\n" "Possible workarounds are:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Set LC_ALL to a locale with encoding %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1775,7 +1775,7 @@ msgstr "" " then apply '%s',\n" " then convert back to %s using 'msgconv'.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1788,7 +1788,7 @@ msgstr "" " then apply '%s',\n" " then convert back to %s using 'msgconv'.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1799,15 +1799,15 @@ msgstr "" "Output of ‘%s’ might be incorrect.\n" "A possible workaround is to set LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "conversion failure" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "input file doesn't contain a header entry with a charset specification" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1816,7 +1816,7 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv() does not " "support this conversion." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1825,11 +1825,11 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(). This version was " "built without iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "backup type" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1852,7 +1852,7 @@ msgstr "" "comments and file positions will be preserved. Where an exact match\n" "cannot be found, fuzzy matching is used to produce better results.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1869,7 +1869,7 @@ msgstr "" " -C, --compendium=FILE additional library of message translations,\n" " may be specified more than once\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1880,7 +1880,7 @@ msgstr "" " -U, --update update def.po,\n" " do nothing if def.po already up to date\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1909,7 +1909,7 @@ msgstr "" "The backup suffix is ‘~’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1924,15 +1924,15 @@ msgstr "" " -v, --verbose increase verbosity level\n" " -q, --quiet, --silent suppress progress indicators\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "this message should define plural forms" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "this message should not define plural forms" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1941,11 +1941,11 @@ msgstr "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s and explicit file names are mutually exclusive" @@ -2095,12 +2095,12 @@ msgstr "" " -d, --repeated print only duplicates\n" " -u, --unique print only unique messages, discard duplicates\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2109,7 +2109,7 @@ msgstr "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2130,7 +2130,7 @@ msgstr "" " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n" " COUNT choose singular/plural form based on this value\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2145,17 +2145,17 @@ msgstr "" "variable TEXTDOMAINDIR.\n" "Standard search directory: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: warning: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2164,15 +2164,15 @@ msgstr "" "Charset “%s” is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Continuing anyway, expect parse errors." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Continuing anyway." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2181,7 +2181,7 @@ msgstr "" "Charset “%s” is not supported. %s relies on iconv(),\n" "and iconv() does not support “%s”.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2189,12 +2189,12 @@ msgstr "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2203,7 +2203,7 @@ msgstr "" "Charset “%s” is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2236,79 +2236,79 @@ msgid "plural form has wrong index" msgstr "plural form has wrong index" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "too many errors, aborting" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "invalid multibyte sequence" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "incomplete multibyte sequence at end of file" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "incomplete multibyte sequence at end of line" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv failure" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "error while reading “%s”" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "keyword “%s” unknown" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "invalid control sequence" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "end-of-file within string" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "end-of-line within string" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "file “%s” is truncated" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "file “%s” contains a not NUL terminated string" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "file “%s” is not in GNU .mo format" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" -msgstr "file “%s” contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" +msgstr "file “%s” contains a not NUL terminated string, at %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "expected two arguments" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Usage: %s [OPTION] URL FILE\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2317,51 +2317,51 @@ msgstr "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "error writing stdout" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "cannot find a temporary directory, try setting $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "cannot create a temporary directory using template “%s”" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "not a valid Java class name: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "failed to create “%s”" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "error while writing “%s” file" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "compilation of Java class failed, please try --verbose or set $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "error while opening “%s” for writing" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internationalized messages should not contain the ‘\\%c’ escape sequence" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2374,64 +2374,64 @@ msgstr "" "different from yours. Consider using a pure ASCII msgid instead.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "cannot create output file “%s”" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard output" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: warning: unterminated character constant" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: warning: unterminated string literal" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "this file may not contain domain directives" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: invalid string definition" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: missing number after #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: invalid string expression" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing cannot be used when output is written to stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext cannot work without keywords to look for" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extract translatable strings from given input files.\n" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2440,7 +2440,7 @@ msgstr "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2455,26 +2455,39 @@ msgstr "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" "If output file is -, output is written to standard output.\n" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2489,7 +2502,7 @@ msgstr "" " -c, --add-comments[=TAG] place comment block with TAG (or those\n" " preceding keyword lines) in output file\n" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2506,7 +2519,7 @@ msgstr "" " -T, --trigraphs understand ANSI C trigraphs for input\n" " --debug more detailed formatstring recognition result\n" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2547,11 +2560,20 @@ msgstr "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2561,7 +2583,7 @@ msgstr "" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "language ‘%s’ unknown" diff --git a/po/es.gmo b/po/es.gmo index 8798b2d3f..ba7c306b1 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 52c63b985..a34a054ac 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-09 13:34-0500\n" "Last-Translator: Max de Mendizábal \n" "Language-Team: Spanish \n" @@ -14,154 +14,154 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "el argumento `%s' es inválido para `%s'" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "el argumento `%s' es ambiguo para `%s'" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Los argumentos válidos son:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error al abrir el fichero \"%s\" para lectura" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "error al leer \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "error al escribir \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "error después de leer \"%s\"" # Nota: El error es del sistema, pero no se sabe cuál es el error, # por eso es (además) desconocido. -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Error del sistema desconocido" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "fallo en el subproceso %s" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: la opción `%s' es ambigua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: la opción `--%s' no admite ningún argumento\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: la opción `%c%s' no admite ningún argumento\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: la opción `%s' requiere un argumento\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción no reconocida `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción no reconocida `%c%s'\n" # acepto la sugerencia de em en cuanto a que inválida parece cárcel # o inútil pero mejor puse inválida -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción inválida -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción inválida -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: la opción requiere un argumento -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: la opción `-W %s' es ambigua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: la opción `-W %s' no admite ningún argumento\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "No se encontró a la máquina virtual de Java, intente instalar gij o poner " "$JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "Memoria agotada" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "no se puede crear la tubería" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "subproceso %s" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "el subproceso %s tiene una señal fatal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "el número de especificaciones de formato en `msgid' y '%s' no coincide" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" @@ -169,8 +169,8 @@ msgstr "" "las especificaciones de formato en 'msgid' y '%s' para el argumento %u no " "son las mismas" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -178,13 +178,13 @@ msgstr "" "una especificación de formato para el argumento %u, como en '%s', no existe " "en 'msgid'" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "una especificación de formato para el argumento %u no existe en '%s'" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -193,12 +193,12 @@ msgstr "" "una especificación de formato para el argumento {%u}, como en '%s', no " "existe en 'msgid'" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "una especificación de formato para el argumento {%u} no existe en '%s'" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" @@ -206,19 +206,19 @@ msgstr "" "las especificaciones de formato en 'msgid' y '%s' para el argumento {%u} no " "son las mismas" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "las especificaciones de formato en '%s' no son un subconjunto de aquellas en " "'msgid'" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -227,7 +227,7 @@ msgstr "" "las especificaciones de formato en `msgid' requieren un mapeo, y aquellas en " "'%s' requieren una tupla" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -236,7 +236,7 @@ msgstr "" "las especificaciones de formato en `msgid' requieren una tupla y aquellas en " "'%s' requieren un mapeo" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -245,12 +245,12 @@ msgstr "" "una especificación de formato para el argumento '%s', como en '%s', no " "existe en 'msgid'" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "una especificación de formato para el argumento '%s' no existe en '%s'" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -258,11 +258,11 @@ msgstr "" "las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no " "son las mismas" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -274,33 +274,33 @@ msgstr "" "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" "FIN DETERMINADO.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "demasiados argumentos" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "faltan argumentos" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -309,7 +309,7 @@ msgstr "" "Modo de empleo: %s [OPCIÓN] [[DOMINIOTEXTO] MSGID]\n" " o: %s [OPCIÓN] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Mostrar la traducción a idioma nativo de un mensaje textual.\n" @@ -327,7 +327,7 @@ msgstr "Mostrar la traducci # Prefiero que se quede como está, pues aunque se repite muestra, # es en otra opción en donde aparece. mm # -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -351,7 +351,7 @@ msgstr "" # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto # no se pueden traducir (cuando se refieren a las variables, claro está). -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -373,25 +373,25 @@ msgstr "" "encuentre dentro del catálogo seleccionado.\n" "Directorio de búsqueda estándar: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Comunicar los `bugs' a .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Muestra el nombre de la máquina.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -406,9 +406,9 @@ msgstr "" " completo del dominio calificado,\n" " -i, --ip-address dirección del nombre de la máquina\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -419,32 +419,32 @@ msgstr "" " -h, --help muestra esta ayuda y finaliza\n" " -V, --version muestra la versión y finaliza\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "no se pudo obtener el nombre de la máquina" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "sólo se permite un fichero de entrada máximo" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s y %s son mutuamente excluyentes" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -453,15 +453,15 @@ msgstr "" "Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n" "atributos, y luego manipula los atributos.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Los argumentos obligatorios para las opciones largas también son obligatorios para las opciones cortas.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -475,8 +475,8 @@ msgstr "" " de ficheros de entrada\n" "Si no se da ningún fichero de entrada o si es -, se lee la entrada estándar.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -489,7 +489,7 @@ msgstr "" "Los resultados se escriben a la salida estándar si no se especifica ningún\n" "fichero de salida o si es -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -508,7 +508,7 @@ msgstr "" " --no-obsolete elimina los mensajes obsoletos #~\n" " --only-obsolete conserva los mensajes obsoletos #~\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -527,7 +527,7 @@ msgstr "" " --fuzzy sinónimo de --only-fuzzy --clear-fuzzy\n" " --obsolete sinónimo de --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -560,12 +560,12 @@ msgstr "" " -s, --sort-output genera una salida ordenada\n" " -F, --sort-by-file ordena la salida por localización de ficheros\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "se especificó un criterio de selección imposible (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n" @@ -596,7 +596,7 @@ msgstr "" "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n" "los ficheros PO se conservarán. \n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -613,7 +613,7 @@ msgstr "" " de ficheros de entrada\n" "Si el fichero de entrada es -, se lee la entrada estándar.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -690,7 +690,7 @@ msgstr "" " -s, --sort-output escribe la salida ordenada\n" " -F, --sort-by-file escribe la salida ordenada por fichero\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -701,15 +701,15 @@ msgstr "" " -h, --help muestra esta ayuda y finaliza\n" " -V, --version muestra la versión y finaliza\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "no se especificaron ficheros de entrada" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "se requieren exactamente 2 ficheros de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n" @@ -774,7 +774,7 @@ msgstr "Modo de empleo: %s [OPCI # y en otros de otra (la frase no era exactamente igual). # 11061996mm: En particular en gettext el letrero es estándar, por lo que # prefiero "también son" que, creo suena mejor. Homogeinizo todo. -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -793,7 +793,7 @@ msgstr "" "se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n" "tal forma que la precisión del diagnóstico sea mejor.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -807,7 +807,7 @@ msgstr "" " -D, --directory=DIRECTORIO añade al DIRECTORIO a la lista de búsqueda\n" " de ficheros de entrada\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -817,20 +817,20 @@ msgstr "" " -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n" " def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "este mensaje se usa pero no está definido..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...pero esta definición es parecida" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "este mensaje se usa pero no está definido en %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "atención: este mensaje no se utiliza" @@ -855,27 +855,18 @@ msgstr "atenci # # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la # aventura. Quizá no sea tan malo como dice Enrique, a menos que... -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "se encontró el error fatal %d" msgstr[1] "se encontraron %d errores fatales" -# Nota: es la definición la que está duplicada. -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definición del mensaje duplicada" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...aquí está la primera definición" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "se deben especificar por lo menos dos ficheros" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -898,7 +889,7 @@ msgstr "" "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n" "conservarán.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -921,7 +912,7 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -974,7 +965,7 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -1007,11 +998,11 @@ msgstr "" " -F, --sort-by-file escribe la salida ordenada por fichero\n" # acepto sugerencia de em pero agrego un "el". mm -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "no se especificó el fichero de entrada" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "se requieren exactamente un ficheros de entrada" @@ -1047,16 +1038,16 @@ msgstr "" " de ficheros de entrada\n" "Si el fichero de entrada es -, se lee la entrada estándar.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "Se omitió el nombre de la instrucción" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -1072,7 +1063,7 @@ msgstr "" "msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n" "todas las invocaciones.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -1082,7 +1073,7 @@ msgstr "" "traducción, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n" "utilizar como entrada para \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -1096,34 +1087,34 @@ msgstr "" " de ficheros de entrada\n" "Si no se especifica un fichero de entrada o es -, se lee la entrada estándar.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "fallo en la escritura a la salida estándar" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "fallo en la escritura la subproceso %s" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "falta el nombre del filtro" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "se debe especificar al menos un guión de sed" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Aplica un filtro a todas las traducciones de un catálogo de traducción.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1132,7 +1123,7 @@ msgstr "" "El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n" "estándar y escriba una traducción modificada a la salida estándar.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1152,7 +1143,7 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1187,84 +1178,84 @@ msgstr "" " -s, --sort-output escribe la salida ordenada\n" " -F, --sort-by-file escribe la salida ordenada por fichero\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "fallo en la comunicación con el subproceso %s" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "fallo en la lectura del subproceso %s" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "el subproceso %s terminó con un código de salida %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "el argumento a %s debe ser un solo carácter de puntuación" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requiere que se especifique un \"-d directorio\"" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requiere que se especifique un \"-l local\"" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s sólo es válido con %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s sólo es válido con %s o %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d mensaje traducido" msgstr[1] "%d mensajes traducidos" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traducción difusa" msgstr[1] ", %d traducciones difusas" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d mensaje sin traducir" msgstr[1] ", %d mensajes sin traducir" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Genera un catálogo binario de mensajes a partir de la descripción de la traducción textual.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1278,7 +1269,7 @@ msgstr "" " ficheros de entrada\n" "Si el fichero de entrada es -, se lee la entrada estándar.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1293,7 +1284,7 @@ msgstr "" " (JDK 1.2 o superior)\n" " --tcl Modo tcl: genera un fichero .msg tcl/msgcat\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1306,7 +1297,7 @@ msgstr "" " --strict habilita el modo estricto de Uniforum\n" "Si el fichero de salida es -, se escribe en la salida estándar.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1325,7 +1316,7 @@ msgstr "" "recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n" "se escribe bajo el directorio especificado.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1341,7 +1332,7 @@ msgstr "" "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n" "el directorio especificado.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1371,7 +1362,7 @@ msgstr "" " teclado para los elementos del menú\n" " -f, --use-fuzzy utiliza entradas difusas para la salida\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1383,7 +1374,7 @@ msgstr "" " (por defecto es: %d)\n" " --no-hash el fichero binario no incluirá la tabla de hash\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1398,26 +1389,26 @@ msgstr "" " --statistics muestra las estadísticas sobre las traducciones\n" " -v, --verbose aumenta el cantidad de mensajes\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "la expresión plural puede producir resultados negativos" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu pero las expresiones plurales pueden producir valores tan " "grades como %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "la expresión plural puede producir una división por cero" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "la expresión plural puede producir un sobreflujo entero" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1425,51 +1416,51 @@ msgstr "" "la expresión plural puede producir excepciones aritméticas, posiblemente una " "división por cero" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "valor inválido de nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "expresión plural inválida" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu ..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural" msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "... pero algunos mensajes tienen solo una forma plural" msgstr[1] "... pero algunos mensajes tienen %lu formas plurales" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Pruebe utilizando lo siguiente, válido para %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1493,7 +1484,7 @@ msgstr "" # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea). # Si no se te ocurre nada mejor, sugerencia: # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+ -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial" @@ -1514,7 +1505,7 @@ msgstr "" # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea). # Si no se te ocurre nada mejor, sugerencia: # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+ -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "" @@ -1536,129 +1527,138 @@ msgstr "" # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea). # Si no se te ocurre nada mejor, sugerencia: # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+ -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial" # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene # y la otra no, así de sencillo. sv+ -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final" # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene # y la otra no, así de sencillo. sv+ -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final" # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene # y la otra no, así de sencillo. sv+ -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "el manejo del plural es una extensión del gettext de GNU" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr no tiene la marca del acelerador de teclado '%c'" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "no existe el campo `%s' en la cabecera\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "algunos campos de cabecera aún tienen el valor inicial por defecto\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "el campo `%s' aún tiene el valor inicial por defecto\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "atención: el encabezado del fichero PO no existe o es inválido\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "atención: la conversión del conjunto de caracteres no funcionará\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "atención: el encabezado del fichero PO está difuso\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" "atención: las versiones anteriores de msgfmt producirán un error en esto\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n" "se utilizará un prefijo" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "la instrucción `domain %s' no tiene efecto" +# Nota: es la definición la que está duplicada. +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definición del mensaje duplicada" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...aquí está la primera definición" + # Nunca me gustó ignorar para "to ignore". # Ignorar es no saber (not to know). "to ignore" es "no hacer caso". # Sugerencia: Descartar. sv # Excelente palabreja. Me gusta mucho. mm -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "se descarta la línea vacía `msgstr'" # Lo mismo. sv # Ok. mm -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "se descarta la línea difusa `msgstr'" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: atención: el fichero fuente contiene una traducción difusa" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "la opción '%c' no se puede usar antes de que 'K' o 'T' hayan sido " "especificadas" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1667,7 +1667,7 @@ msgstr "" "Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n" "patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1732,7 +1732,7 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1765,11 +1765,11 @@ msgstr "" " --sort-by-file escribe la salida ordenada por localización \n" " de fichero\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "fallo en la escritura al subproceso grep" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1779,7 +1779,7 @@ msgstr "" "de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n" "es necesario para que se puedan probar las traducciones.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1790,12 +1790,12 @@ msgstr "" "Favor de especificar el formato local a través de la opción --locale o\n" "el fichero de salida .po a través de la opción --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Creado %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1804,7 +1804,7 @@ msgstr "" "Crea un nuevo fichero PO, inicializando la metainformación con valores\n" "tomados del entorno del usuario.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1818,7 +1818,7 @@ msgstr "" "actual.\n" "Si es -, se lee la entrada estándar.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1832,7 +1832,7 @@ msgstr "" "de la selección local del usuario. Si es -, los resultados se escriben en\n" "la salida estándar.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1850,7 +1850,7 @@ msgstr "" " --no-wrap no divide a las líneas de los mensajes, aunque\n" " sean mayores a la anchura de la página de salida\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1859,11 +1859,11 @@ msgstr "" "Favor de especificar el fichero .pot de entrada utilizando la opción --" "input\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "error en la lectura del directorio actual" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1872,23 +1872,23 @@ msgstr "" "Favor de especificar el fichero .pot de entrada utilizando la opción --" "input\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fallo en fdopen()" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "error de E/S en el subproceso %s" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "fallo en el subproceso %s con código de salida %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1904,26 +1904,26 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Traducciones al español para el paquete %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" "el conjunto de caracteres actual \"%s\" no es un nombre de codificación " "portátil" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" "hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de " "entrada" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" @@ -1931,7 +1931,7 @@ msgstr "" "el fichero de entrada `%s' no contiene una línea de encabezado con la " "especificación del conjunto de caracteres" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1940,19 +1940,19 @@ msgstr "" "el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n" "encabezado con la especificación del conjunto de caracteres" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" "el conjunto de caracteres destino \"%s\" no es un nombre de codificación " "portátil." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "atención: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1960,7 +1960,7 @@ msgstr "" "Los ficheros de entrada contienen mensajes en distintas codificaciones,\n" "UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1972,7 +1972,7 @@ msgstr "" "%s y %s entre otras.\n" "Por ello se convierte la salida a UTF-8.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1985,12 +1985,12 @@ msgstr "" "La salida de '%s' podría ser incorrecta.\n" "Las posibles alternativas son:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Poner LC_ALL como local con la codificación %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -2001,7 +2001,7 @@ msgstr "" " y luego aplicar '%s',\n" " y luego reconvertirlo a %s utilizando 'msgconv'.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -2014,7 +2014,7 @@ msgstr "" " y luego aplicar '%s',\n" " y luego reconvertirlo a %s utilizando 'msgconv'.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -2026,17 +2026,17 @@ msgstr "" "La salida de '%s' podría ser incorrecta.\n" "Una alternativa posible s poner LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "falla de conversión" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" "El fichero de entrada no contiene una línea de encabezado que especifique el " "conjunto de caracteres" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -2045,7 +2045,7 @@ msgstr "" "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n" "no soporta este tipo de conversión." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -2054,11 +2054,11 @@ msgstr "" "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n" "Esta versión fue construida sin iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "tipo de respaldo" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -2081,7 +2081,7 @@ msgstr "" "haya una coincidencia exacta, se utilizará el método de comparación difusa\n" "para obtener mejores resultados.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -2099,7 +2099,7 @@ msgstr "" " -C, --compendium=FICHERO biblioteca adicional de traducción de mensajes,\n" " puede ser especificada más de una vez\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -2110,7 +2110,7 @@ msgstr "" " -U, --update actualiza def.po,\n" " no hace nada si def.po ya está actualizado\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -2141,7 +2141,7 @@ msgstr "" "El sufijo de los respaldos es `~', a menos que se ponga la opción --suffix o\n" "la variable de entorno SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -2156,15 +2156,15 @@ msgstr "" " -v, --verbose incrementa el nivel de mensajes\n" " -q, --quiet, --silent suprime los indicadores de progreso\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "este mensaje debería definir las formas plurales" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "este mensaje no debería definir las formas plurales" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2174,11 +2174,11 @@ msgstr "" "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n" # Porque no mejor poner simplemente 'fin'? mm++ -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " terminado.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes" @@ -2334,12 +2334,12 @@ msgstr "" " -u, --unique muestra sólo los mensajes únicos, descarta a\n" " los duplicados\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Modo de empleo: %s [OPCIÓN] [DOMINIODETEXTO] MSGID MSG-PLURAL CUENTA\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2361,7 +2361,7 @@ msgstr "" # Prefiero que se quede como está, pues aunque se repite muestra, # es en otra opción en donde aparece. mm # -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2386,7 +2386,7 @@ msgstr "" # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto # no se pueden traducir (cuando se refieren a las variables, claro está). -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2401,17 +2401,17 @@ msgstr "" "puede especificar otro lugar.\n" "Directorio de búsqueda estándar: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: atención: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2421,15 +2421,15 @@ msgstr "" "La conversión de mensajes al conjunto de caracteres del usuario podría no " "funcionar.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Se continúa de todas formas, aunque habrá errores de parseo." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Se continúa de todas formas." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2438,7 +2438,7 @@ msgstr "" "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n" "e iconv() no soporta \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2446,12 +2446,12 @@ msgstr "" "Instalando GNU libiconv y luego reinstalando GNU gettext\n" "podría arreglar este problema.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2460,7 +2460,7 @@ msgstr "" "El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n" "Esta versión fue construida sin iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2527,79 +2527,79 @@ msgstr "la primera forma del plural tiene un # hablar en primera persona sino en estilo impersonal. # (Esta regla estará en el manual de Enrique, con toda seguridad). #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "demasiados errores, programa interrumpido" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "sucesión de multibyte inválida" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "sucesión de multibyte inválida al final del fichero" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "sucesión de multibyte inválida al final de la línea" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "fallo en iconv" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "error al leer \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "palabra clave \"%s\" desconocida" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "secuencia de control ilegal" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "fin de fichero dentro de una cadena" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "fin de línea dentro de una cadena" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "el fichero \"%s\" está truncado" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "el fichero \"%s\" no está en el formato .mo de GNU" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "se esperan dos argumentos" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2608,45 +2608,45 @@ msgstr "" "Trae y muestra el contenido de una URL. Si la URL no puede ser accesada,\n" "se utiliza el FICHERO local.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "error al escribir la salida estándar" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "no es un nombre de clase Java válido: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "fallo al crear \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "hubo un error al escribir el fichero \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "error al abrir el fichero \"%s\" para escritura" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2654,7 +2654,7 @@ msgstr "" "Los mensajes internacionalizados no deben contener la secuencia de escape `\\" "%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2667,22 +2667,22 @@ msgstr "" "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n" "en ASCII puro. %s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "no se puede crear el fichero de salida \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "salida estándar" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: atención: constante de tipo carácter no finalizada" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: atención: literal de cadena no finalizada" @@ -2718,48 +2718,48 @@ msgstr "%s:%d: atenci # mente el verbo poder en Castellano es mucho más flexible que en otros # idiomas. De todas maneras siempre se puede mirar otras traducciones. em # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "este fichero no puede contener instrucciones de dominio" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: definición de cadena inválida" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: falta un número después del símbolo #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: expresión de cadena inválida" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "no se puede utilizar --join-existing cuando el resultado se escribe en la\n" "salida estándar (stdout)" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext no puede funcionar sin palabras claves que buscar" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "atención: el fichero `%s' con extensión `%s'\n" "es desconocido; se intentará tipo C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2768,7 +2768,7 @@ msgstr "" "Los argumentos obligatorios en las opciones largas también lo son para las \n" "opciones cortas. De forma similar se comportan los argumentos opcionales.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2785,14 +2785,14 @@ msgstr "" " directorio DIR\n" "Si el fichero de salida es -, la salida será escrita a la salida estándar.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2805,7 +2805,16 @@ msgstr "" "Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero\n" "de entrada.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2821,7 +2830,7 @@ msgstr "" " aquellas líneas que preceden a la palabra\n" " clave) en el fichero de salida\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2842,7 +2851,7 @@ msgstr "" " --debug muestra con más detalle el reconocimiento\n" " de las cadenas de formato\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2892,11 +2901,18 @@ msgstr "" " -M, --msgstr-suffix[=CADENA] utiliza la CADENA o \"\" como sufijo para las\n" " líneas del msgstr\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrada estándar" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2906,7 +2922,7 @@ msgstr "" "gettext(\"\") regresa la línea de encabezado con la\n" "metainformación, no una cadena vacía.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "idioma `%s' desconocido" diff --git a/po/et.gmo b/po/et.gmo index 409d22e84..f83ead0ab 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index c894a527d..daac1ebac 100644 --- a/po/et.po +++ b/po/et.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-04-30 16:25+0200\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" @@ -13,231 +13,231 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "viga faili \"%s\" avamisel (lugemiseks)" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "viga faili \"%s\" avamisel (kirjutamiseks)" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "viga \"%s\" lugemisel" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "viga faili \"%s\" kirjutamisel" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "viga \"%s\" lugemisel" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Tundmatu süsteemne viga" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: võti `%s' on mitmetähenduslik\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: võtmel `--%s' ei tohi olla argumente\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: võtmel `%c%s' ei tohi olla argumente\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: võtme `%s' järel peab olema argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tundmatu võti `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tundmatu võti `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: lubamatu võti -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: vigane võti -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: võtme järel peab olema argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: võti `-W %s' on mitmetähenduslik\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "mälu sai otsa" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "ei suuda luua väljundfaili \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,45 +250,45 @@ msgstr "" "TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n" "Litsentsi.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Selle programmi on kirjutanud %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "liiga palju argumente" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argumendid on puudu" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Täiendava info saamiseks proovi `%s --help'.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -313,7 +313,7 @@ msgstr "" " määratud piirkonnas ja omavad identifikaatorit\n" " STRID\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -336,26 +336,26 @@ msgstr "" "found in the selected catalog are translated.!!!\n" "Standardne otsinukataloog: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Vigadest teata aadressile .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -365,9 +365,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -375,47 +375,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ja %s on vastastikku välistavad" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -424,8 +424,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -434,7 +434,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -446,7 +446,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -458,7 +458,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -499,12 +499,12 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -537,7 +537,7 @@ msgstr "" "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n" "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -547,7 +547,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -627,7 +627,7 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -635,20 +635,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "sisendfailid on määramata" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "vaja läheb täpselt kahte sisendfaili" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -674,7 +674,7 @@ msgstr "" "teated on tõlgitud. Kui täpseid vasteid ei suudeta leida, kasutatakse parema\n" "diagnoosi huvides määratlust 'kahtlane'.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -683,50 +683,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "see teade on kasutusel, kuid kirjeldamata..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...kuid see kirjeldus on sarnane" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "hoiatus: see teade on kasutamata" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "leitud %d tõsine viga" msgstr[1] "leitud %d tõsist viga" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "teade on kirjeldatud kaks korda" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...see on esimese kirjelduse asukoht" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "vähemalt kaks faili peab olema ette antud" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -753,7 +745,7 @@ msgstr "" "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n" "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -780,7 +772,7 @@ msgstr "" "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n" "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -835,7 +827,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -876,11 +868,11 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "sisendfail on määramata" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "vaja läheb täpselt kahte sisendfaili" @@ -908,17 +900,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "argumendid on puudu" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -928,14 +920,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -944,43 +936,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "argumendid on puudu" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "vähemalt kaks faili peab olema ette antud" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -990,7 +982,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1032,84 +1024,84 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d tõlgitud teade" msgstr[1] "%d tõlgitud teadet" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d kahtlane tõlge" msgstr[1] ", %d kahtlast tõlget" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d tõlkimata teade" msgstr[1] ", %d tõlkimata teadet" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1118,7 +1110,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1127,7 +1119,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1136,7 +1128,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1148,7 +1140,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1158,7 +1150,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1174,7 +1166,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1182,7 +1174,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1192,211 +1184,219 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "vigane juhtjada" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata" msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata" msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "päise kirjest on puudu väli `%s'" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "päise kirjes peab väli `%s' algama rea algusest" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "väli `%s' sisaldab ikka veel algset väärtust" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n" "%*s hoiatus: charset conversion will not work" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "Kooditabel on päises kirjeldamata.\n" "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n" "%*s hoiatus: charset conversion will not work" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "ignoreerin `domain %s' direktiivi" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "teade on kirjeldatud kaks korda" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...see on esimese kirjelduse asukoht" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "ignoreerin tühja `msgstr' kirjet" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ignoreerin kahtlast `msgstr' kirjet" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1427,7 +1427,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1468,18 +1468,18 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1487,19 +1487,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1508,7 +1508,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1517,7 +1517,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1528,39 +1528,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1572,52 +1572,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 #, fuzzy msgid "warning: " msgstr "%s: hoiatus: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1626,7 +1626,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1635,12 +1635,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1648,7 +1648,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1657,7 +1657,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1665,15 +1665,15 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1682,7 +1682,7 @@ msgstr "" "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n" "iconv() poolt ja iconv() ei toeta \"%s\".\n" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1691,11 +1691,11 @@ msgstr "" "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n" "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1722,7 +1722,7 @@ msgstr "" "kahtlased. Kui väljundfaili ei ole kirjeldatud, saadetakse tulemus\n" "standardväljunisse.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1733,7 +1733,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1741,7 +1741,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1758,7 +1758,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1768,17 +1768,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1787,11 +1787,11 @@ msgstr "" "%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %" "ld, vananenuid %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " valmis.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ja %s on vastastikku välistavad" @@ -1909,19 +1909,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1947,7 +1947,7 @@ msgstr "" " STRID STRID-MITMUS tõlgib STRID (ainsus) / STRID-MITMUS (mitmus)\n" " ARV valib ainsuse/mitmuse vormi sellele arvule\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1963,17 +1963,17 @@ msgstr "" "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n" "Standardne otsinukataloog: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: hoiatus: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -1982,15 +1982,15 @@ msgstr "" "Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n" "Teadete tõlkimine kasutaja kooditabeli järgi võib mitte toimida.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Jätkan siiski, vaatamate parsimisvigadele." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Jätkan siiski." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -1999,7 +1999,7 @@ msgstr "" "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n" "iconv() poolt ja iconv() ei toeta \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2008,12 +2008,12 @@ msgstr "" "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n" "GNU gettext\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2022,7 +2022,7 @@ msgstr "" "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n" "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2055,133 +2055,133 @@ msgid "plural form has wrong index" msgstr "mitmuse vorm omab vale indeksit" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "liiga palju vigu, katkestan töö" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "vigane multibait jada" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "vigane multibait jada" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "vigane multibait jada" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "viga \"%s\" lugemisel" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "tundmatu võtmesõna: \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "vigane juhtjada" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "Ootamatu faili lõpp (fail lõppeb poole stringi pealt)" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "reavahetus asub stringi sees" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "faili \"%s\" sai kärbitud" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "fail \"%s\" ei ole GNU .mo vormingus" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "liiga palju argumente" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "viga faili \"%s\" kirjutamisel" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "ei suuda luua väljundfaili \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "viga faili \"%s\" kirjutamisel" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "viga faili \"%s\" avamisel (kirjutamiseks)" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2190,73 +2190,73 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "ei suuda luua väljundfaili \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standardväljund" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: lõpetamata sümbolkonstant" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: hoiatus: lõpetamata string" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "see fail ei tohi sisaldada domeeni direktiive" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse " "standardväljundisse" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2266,19 +2266,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2288,7 +2297,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2299,7 +2308,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2345,22 +2354,33 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standardsisend" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "tundmatu keel `%s'" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "hüpe \"%s\" positsioonile %ld ebaõnnestus" diff --git a/po/fi.gmo b/po/fi.gmo index 9350cd14a..fd4dae766 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 46176a196..63272bed9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-06-05 18:06+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" @@ -15,198 +15,198 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "virheellinen argumentti `%s' `%s':lle" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "moniselitteinen argumentti `%s' `%s':lle" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Kelvolliset argumentit ovat:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "virhe avattaessa \"%s\" lukemista varten" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "ei voida avata varmuuskopiotiedostoa \"%s\" kirjoittamista varten" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "virhe luettaessa \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "virhe kirjoitettaessa \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "virhe \"%s\" lukemisen jälkeen" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Tuntematon järjestelmän virhe" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s aliprosessi epäonnistui" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: valitsin `%s' on moniselitteinen\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: valitsin `--%s' ei salli argumenttia\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: valitsin `%c%s' ei salli argumenttia\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: valitsin `%s' vaatii argumentin\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tuntematon valitsin `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tuntematon valitsin `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: virheellinen valitsin -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: virheellinen valitsin -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: valitsin vaatii argumentin -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: valitsin `-W %s' on moniselitteinen\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valitsin `-W %s' ei salli argumenttia\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Java-kääntäjää ei löytynyt, yritä gcj:n asentamista tai aseta $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Java virtuaalikonetta ei löytynyt, yritä gij:n asentamista tai aseta $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "muisti loppu" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "ei voi luoda putkea" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s aliprosessi" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s aliprosessi vastaanotti fataalin signaalin %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä ei täsmää" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä argumentille %u ei ole sama" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "muotomäärittelyä argumentille %u ei ole olemassa 'msgid':lle '%s':ssä" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "muotomäärittely argumentille %u ei ole '%s':ssä" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "muotomäärittely argumentille {%u}, kuten '%s':ssä, ei ole 'msgid':ssä" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "muotomäärittely argumentille {%u} ei ole '%s':ssä" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" "muotomäärittelyt 'msgid':ssä ja '%s':ssä argumentille {%u} eivät ole samat" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "muotomäärittelyt 'msgid' ja '%s' eivät ole yhdenmukaiset" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "muotomäärittelyt '%s':ssä eivät ole 'msgid':n muotomäärittelyiden osajoukko" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -215,7 +215,7 @@ msgstr "" "muotomäärittelyt 'mdgid':ssä edellyttävät kartoitusta, määrittelyt '%s':ssä " "edellyttävät " -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -224,30 +224,30 @@ msgstr "" "muotomäärittelyt 'msgid':ss' edellyttävät järjestettyä joukkoa, määrittelyt " "'%s':ss' edellyttävät " -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "muotomäärittelyä argumentille '%s', kuten '%s':ssä, ei löydy " -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "muotomäärittelyä argumentille '%s' ei löyty '%s':stä" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" "muotomäärittely 'msgid':ssä ja '%s':ssä argumentille '%s' eivät ole samat" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -259,33 +259,33 @@ msgstr "" "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE TIETTYYN\n" "tarkoitukseen.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Kirjoittanut %s\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "liian monta argumenttia" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "ei riittävästi argumentteja" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Yritä `%s --help' saadaksesi lisää tietoja.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -294,12 +294,12 @@ msgstr "" "Käyttö: %s [VALITSIN] [[TEXTDOMAIN] MSGID]\n" "tai: %s [VALITSIN] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Näytä kansallinen käännös tekstimuotoiselle viestille.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -321,7 +321,7 @@ msgstr "" " [TEXTDOMAIN] MSGID etsii käännetyn viestin, joka vastaa MSGID:tä\n" " TEXTDOMAIN:ssa\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -334,25 +334,25 @@ msgid "" "Standard search directory: %s\n" msgstr "" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Ilmoita ohjelmiston vioista osoitteeseen .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Käyttö: %s [VALITSIN]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Tulosta laitteen isäntänimi.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -367,9 +367,9 @@ msgstr "" " sen mahdolliset lisänimet\n" " -i, --ip-address osoitteet isäntänimelle\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -381,47 +381,47 @@ msgstr "" " -V, --version näyttää ohjelmiston version ja lopettaa\n" " suorituksen\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "ei saatu isäntänimeä" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "enintään yksi syötetiedosto on sallittu" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ja %s ovat toisensa poissulkevia" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -430,8 +430,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -440,7 +440,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -452,7 +452,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -464,7 +464,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -482,12 +482,12 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -506,7 +506,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -516,7 +516,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -559,7 +559,7 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -567,20 +567,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -591,7 +591,7 @@ msgid "" "match cannot be found, fuzzy matching is used to produce better diagnostics.\n" msgstr "" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -600,50 +600,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "" -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "" msgstr[1] "" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -656,7 +648,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -669,7 +661,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -701,7 +693,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -719,11 +711,11 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "" @@ -750,16 +742,16 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -769,14 +761,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -785,41 +777,41 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -829,7 +821,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -848,84 +840,84 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -934,7 +926,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -943,7 +935,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -952,7 +944,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -964,7 +956,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -974,7 +966,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -990,7 +982,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -998,7 +990,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1008,200 +1000,208 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1232,7 +1232,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1250,18 +1250,18 @@ msgid "" " --sort-by-file sort output by file location\n" msgstr "" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1269,19 +1269,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1290,7 +1290,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1299,7 +1299,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1310,39 +1310,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1354,51 +1354,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1407,7 +1407,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1416,12 +1416,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1429,7 +1429,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1438,7 +1438,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1446,33 +1446,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1486,7 +1486,7 @@ msgid "" "cannot be found, fuzzy matching is used to produce better results.\n" msgstr "" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1497,7 +1497,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1505,7 +1505,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1522,7 +1522,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1532,26 +1532,26 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" msgstr "" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr "" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "" @@ -1656,19 +1656,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1681,7 +1681,7 @@ msgid "" " COUNT choose singular/plural form based on this value\n" msgstr "" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1691,57 +1691,57 @@ msgid "" "Standard search directory: %s\n" msgstr "" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -1772,129 +1772,129 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -1903,71 +1903,71 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -1977,19 +1977,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -1999,7 +2008,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2010,7 +2019,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2033,18 +2042,25 @@ msgid "" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" msgstr "" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "" diff --git a/po/fr.gmo b/po/fr.gmo index ba893c755..9a2f568c1 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 203ec1e24..c6bb8dd1c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-08 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -16,152 +16,152 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "argument invalide « %s » pour « %s »" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "argument ambigu « %s » pour « %s »" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Les arguments valides sont:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erreur lors de l'ouverture de « %s » en lecture" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "erreur d'ouverture du fichier d'archive « %s » en écriture" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "erreur de lecture « %s »" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "erreur d'écriture « %s »" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "erreur après la lecture de « %s »" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Erreur système non identifiée" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "échec du sous-processus %s" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'option « %s » est ambiguë\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'option « --%s » ne tolère pas d'argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'option « %c%s » ne tolère pas d'argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'option « %s » exige un argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: l'option « --%s » n'est pas reconnue\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: l'option « %c%s » n'est pas reconnue\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: l'option « %c » n'est pas permise\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: l'option « %c » n'est pas valide\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'option « %c » exige un argument\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'option « -W %s » est ambiguë\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "Compilateur Java n'a pas été repéré, essayer d'installer gcj ou défitni " "$JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Machine virtuelle Java n'a pas été repérée, essayer d'installer gij ou " "définir $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "Mémoire épuisée" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "incapable de créer le pipe" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "sous-processus %s" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "le sous-processus %s a reçu le signal fatal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "nombre de spécifications de format entre « msgid » et « %s » ne concorde pas" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" @@ -169,8 +169,8 @@ msgstr "" "spécifications de format entre « msgid » et « %s » de l'argument %u ne sont " "pas identiques" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -178,13 +178,13 @@ msgstr "" "spécification de format de l'argument « %u », comme dans « %s », n'existe " "pas dans « msgid »" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "spécification de format de l'argument %u n'existe pas dans « %s »" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -193,12 +193,12 @@ msgstr "" "spécification de format de l'argument {%u}, comme dans « %s », n'existe pas " "dans « msgid »" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "spécification de format de l'argument {%u} n'existe pas dans « %s »" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" @@ -206,20 +206,20 @@ msgstr "" "spécifications de format de « msgid » et « %s » de l'argument {%u} ne sont " "pas les mêmes" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "spécifications de format de « msgid » et « %s » ne sont pas équivalentes" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "spécifications de format dans « %s » ne sont pas un sous-ensemble de celles " "de « msgid »" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -228,7 +228,7 @@ msgstr "" "spécifications de format de « msgid » requièrent un mapping, celles de « %s " "» requièrent un tuple" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -237,7 +237,7 @@ msgstr "" "spécifications de format de « msgid » requièrent un tuple, celles de « %s » " "requièrent un mapping" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -246,12 +246,12 @@ msgstr "" "spécification de format de l'argument « %s », comme dans « %s », n'existe " "pas dans « msgid »" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "spécification de format de l'argument « %s » n'existe pas « %s »" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -259,11 +259,11 @@ msgstr "" "spécifications de format de « msgid » et de « %s » de l'argument « %s » ne " "sont pas les mêmes" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -275,33 +275,33 @@ msgstr "" "les permissions de copie. Il est distribué SANS AUCUNE GARANTIE\n" "de QUALITÉ LOYALE ET MARCHANDE ou d'ADÉQUATION POUR UN BUT PARTICULIER.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Écrit par %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "trop d'arguments" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "arguments manquants" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pour plus d'information, essayer « %s --help ».\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -310,12 +310,12 @@ msgstr "" "Usage: %s [OPTION] [[DOMAINE] MSGID]\n" "ou %s [OPTION] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Afficher en langage natif la traduction du message textuel.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -335,7 +335,7 @@ msgstr "" " -V, --version identifier le programme, puis terminer\n" " [DOMAINE] MSGID trouver la traduction de MSGID, dans le DOMAINE donné\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -357,25 +357,25 @@ msgstr "" "\n" "Répertoire standard de recherche: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Rapportez tout problème fonctionnel à .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Afficher le nom de la machine hôte.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -390,9 +390,9 @@ msgstr "" " et les aliases\n" " -i, --ip-address addresses IP de la machine hôte\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -403,32 +403,32 @@ msgstr "" " -h, --help fournir ce message d'aide, puis terminer\n" " -V, --version identifier le programme, puis terminer\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "ne peut obtenir le nom de l'hôte" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "au plus un fichier d'entrée est permis" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s et %s s'excluent mutuellement" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -437,9 +437,9 @@ msgstr "" "Filtrer les messages d'un catalogue de traduction selon leurs attributs\n" "et manipuler leurs attributs.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" @@ -447,7 +447,7 @@ msgstr "" "Les arguments obligatoires pour la forme longue des options sont aussi\n" "obligatoires pour les formes courtes qui leur correspondent.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -460,8 +460,8 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -473,7 +473,7 @@ msgstr "" " -o, --output-file=FICHIER écrire la sortie dans le FICHIER spécifié\n" "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -493,7 +493,7 @@ msgstr "" " --no-obsolete enlever les messages obsolètes #~\n" " --only-obsolete conserver les messages obsolètes #~\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -512,7 +512,7 @@ msgstr "" " --fuzzy identique à --only-fuzzy --clear-fuzzy\n" " --obsolete identique à --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -541,12 +541,12 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Critère de sélection irréalisable (%d < N < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]...\n" @@ -573,7 +573,7 @@ msgstr "" "proviennent du premier fichier PO où elles ont été définies.\n" "Les positions de tous les fichiers PO seront cumulées.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -588,7 +588,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n" "Si le fichier d'entrée est -, lire de l'entrée standard.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -655,7 +655,7 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -666,20 +666,20 @@ msgstr "" " -h, --help fournir ce message d'aide, puis terminer\n" " -V, --version identifier le programme, puis terminer\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "aucun fichier en entrée" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "exactement deux fichiers sont requis en entrée" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -697,7 +697,7 @@ msgstr "" "de votre programme. Lorsqu'un appariement exact n'est pas possible,\n" "un appariement flou est utilisé pour un meilleur diagnostic.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -710,7 +710,7 @@ msgstr "" " ref.pot références aux sources\n" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -719,43 +719,35 @@ msgstr "" "Modificateurs d'opération:\n" " -m, --multi-domain appliquer ref.pot à chaque domaine défini dans def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "ce message, utilisé, n'est pas défini..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...mais cette définition lui est semblable" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "ce message, utilisé, n'est pas défini dans « %s »" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "attention: ce message n'est pas utilisé" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d erreur fatale trouvée" msgstr[1] "%d erreurs fatales trouvées" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "message doublement défini" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...voici l'endroit de la première définition" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "Il faut indiquer au moins deux fichiers" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -775,7 +767,7 @@ msgstr "" "proviennent du premier fichier PO où elles ont été définies.\n" "Les positions de tous les fichiers PO seront cumulées.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -794,7 +786,7 @@ msgstr "" " (sans limite par défaut i.e. = à zéro)\n" " -u, --unique identique à « -< 2 ou --less-than=2 »\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -841,7 +833,7 @@ msgstr "" " -t, --to-code=NOM NOM de l'encodage de sortie\n" "L'encodage par défaut se fait selon l'encodage locale.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -870,11 +862,11 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "aucun fichier d'entrée fourni" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "exactement un fichier d'entrée requis" @@ -909,16 +901,16 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n" "Si le fichier d'entrée est -, lire de l'entrée standard.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "nom de la commande manquant" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Usage: %s [OPTION] COMMANDE [OPTIONS-DE-COMMANDE]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -933,7 +925,7 @@ msgstr "" "la sortie de msgexec. msgexec retourne un code qui correspond au maximum du code de\n" "retour pour toutes les invocations.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -942,7 +934,7 @@ msgstr "" "Une commande spéciale interne appelée sorties « 0 » de traduction, suivi par un\n" "octet null. La sortie de \"msgexec 0\" est acceptable comme entrée pour \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -955,34 +947,34 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichier d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "échec d'écriture sur stdout" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "échec d'écriture au sous-processus %s" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "nom du filtre manquant" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "au moins un script sed doit être spécifié" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTRE [OPTIONS-DE-FILTRAGE]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Appliquer un filtre à toutes les traductions d'un catalogue de traductions.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -991,7 +983,7 @@ msgstr "" "Le FILTRE peut être n'importe quel programme qui lit une traduction à partir\n" "de l'entrée standard et qui modifie la traduction sur la sortie standard.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1006,7 +998,7 @@ msgstr "" " aux commandes à exécuter\n" " -n, --quiet, --silent supprimer l'affichage automatique d'espace\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1039,86 +1031,86 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "ne peut opérer les Entrées/Sorties en mode non bloquant pour le sous-" "processus %s" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "échec de communication avec le sous-processus %s" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "échec de lecture du sous-processus %s" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "fin d'exécution du sous-processus %s avec le code de terminaison %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "l'argument de %s devrait être un simple caractère de ponctuation" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requiert une spécification de type \"-d directory\"" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requiert une spécification de type \"-l locale\"" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s est valable seulement avec %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s est valable seulement avec %s ou %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d message traduit" msgstr[1] "%d messages traduits" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traduction approximative" msgstr[1] ", %d traductions approximatives" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d message non-traduit" msgstr[1] ", %d messages non-traduits" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Usage: %s [OPTION] nom-de-fichier.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Générer un catalogue binaire de messages à partir de la description des traductions textuelles.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1131,7 +1123,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1144,7 +1136,7 @@ msgstr "" " --java2 identique à --java et assume Java2 (i.e. JDK 1.2 ou plus)\n" " --tcl mode Tcl: générer un fichier .msg tcl/msgcat\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1157,7 +1149,7 @@ msgstr "" " --strict permettre le mode de conformité strict au mode Uniforum\n" "Si le fichier de sortie est -, la sortie est produite sur la sortie standard.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1175,7 +1167,7 @@ msgstr "" "séparé par un souligné. L'option -d est obligatoire. La classe est produite\n" "dans le répertoire spécifié.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1190,7 +1182,7 @@ msgstr "" "Les options -l et -d sont obligatoires. Le fichier .msg est écrit dans\n" "le répertoire spécifié.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1215,7 +1207,7 @@ msgstr "" " -C, --check-compatibility vérifier que GNU msgfmt se comporte comme X/Open msgfmt\n" " -f, --use-fuzzy utiliser les entrées floues pour la sortie\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1226,7 +1218,7 @@ msgstr "" " -a, --alignment=NOMBRE aligner les chaînes selon le NOMBRE d'octets (%d par défaut)\n" " --no-hash ne pas inclure la table de hachage dans le fichier binaire\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1241,26 +1233,26 @@ msgstr "" " --statistics afficher les statistiques de traductions\n" " -v, --verbose diagnostiquer toute anomalie dans chaque FICHIER\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "L'expression au pluriel peut produire des valeurs négatives." -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi " "grande que %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "L'expression au pluriel peut produire une division par zéro." -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "L'expression au pluriel peut produire un débordement d'entier" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1268,52 +1260,52 @@ msgstr "" "L'expression au pluriel peut produire une exception arithmétique, " "possiblement une division par zéro" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" "le catalogue de messages contient des formes de traduction au pluriel..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...mais l'attribut « nplurals=ENTIER » est absent de l'en-tête" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "valeur nplurals invalide" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "expression au pluriel invalide" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...mais quelques messages n'ont seulement qu'une forme au pluriel" msgstr[1] "...mais quelques messages n'ont seulement que %lu formes au pluriel" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...mais quelques messages ont une forme au pluriel" msgstr[1] "...mais quelques messages ont %lu formes au pluriel" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Essayer d'utiliser ce qui suit, valide pour %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1321,128 +1313,136 @@ msgstr "" "le catalogue de messages contient des formes de traduction au pluriel, mais " "l'entrée \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" est manquante" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "les chaînes « msgid » et « msgid_plural » ne débutent pas par « \\n »" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n »" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "les chaînes « msgid » et « msgstr » ne débutent pas par « \\n »" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "les chaînes « msgid » et « msgid_plural » ne se terminent pas par « \\n »" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "" "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « \\n »" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "" "l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "le traitement des chaînes au pluriel est une extention de GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" "« %s » n'a pas une chaîne de format %s valide, contrairement à « msgid »" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "« msgstr » n'a pas de raccourci clavier pour la marque « %c »" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "« msgstr » a trop de raccourcis clavier pour la marque « %c »" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "Le champ en-tête « %s » est absent de l'en-tête\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "Quelques champs en-tête ont toujours leur valeur initiale par défaut\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "le champ « %s » a toujours sa valeur initiale par défaut\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "AVERTISSEMENT: l'en-tête du fichier PO est manquante ou invalide\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "AVERTISSEMENT: le conversion du charset ne fonctionnera pas\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "AVERTISSEMENT: l'en-tête du fichier PO est floue\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" "AVERTISSEMENT: les vieilles versions de msgfmt donneront une erreur là " "dessus\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "« %s » n'est pas approprié comme nom de domaine" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "la directive « domain %s » sera ignorée" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "message doublement défini" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...voici l'endroit de la première définition" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "chaîne « msgstr » vide, entrée ignorée" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "chaîne « msgstr » floue, entrée ignorée" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "l'option « %c » ne peut être utilisée avant que « K » ou « T » ne soit " "spécifié" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1451,7 +1451,7 @@ msgstr "" "Extraire tous les messages du catalogue de traduction qui concordent avec\n" "un patron particulier ou qui appartiennent à un fichier source donné.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1509,7 +1509,7 @@ msgstr "" " -f, --file=FICHIER obtenir le patron à partir du FICHIER\n" " -i, --ignore-case ignorer la distinction liée à la casse\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1538,11 +1538,11 @@ msgstr "" " --sort-output générer une sortie triée\n" " --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "écriture vers le sous-processus de grep a échoué" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1552,7 +1552,7 @@ msgstr "" "définir votre variable d'environnement LANG, tel que décrit dans\n" "le fichier ABOUT-NLS. Cela est nécessaire afin de tester votre traduction.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1563,12 +1563,12 @@ msgstr "" "SVP définir la locale à l'aide de l'option --locale ou\n" "du fichier de sortie .po à l'aide de l'option --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "%s créé.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1577,7 +1577,7 @@ msgstr "" "Créer un nouveau fichier PO en initialisant la méta-information avec des valeurs\n" "provenant de l'environnement de l'usager.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1590,7 +1590,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1604,7 +1604,7 @@ msgstr "" "--locale ou selon celle de l'usager. Si la sortie est -, les résultats sont écrits\n" "sur la sortie standard.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1621,7 +1621,7 @@ msgstr "" " --no-wrap ne pas briser les lignes de longs messages plus longues que\n" " que la largeur des pages de sortie en plusieurs lignes\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1629,11 +1629,11 @@ msgstr "" "Plus d'un fichiers .pot repérés.\n" "SVP spécifier le fichier d'entrée .pot à l'aide de l'option --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "erreur de lecture du répertoire courant" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1641,23 +1641,23 @@ msgstr "" "Aucun fichier .pot dans le répertoire courant.\n" "SVP spécifier le fichier d'entrée .pot à l'aide de l'option --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "échec de fdopen()" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "Erreur d'E/S du sous-processus %s" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "échec du sous-processus %s avec le code de fin d'exécution %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1674,22 +1674,22 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Traduction anglaise du package %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "le présent charset « %s » n'a pas un nom d'encodage portable" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "deux charsets différents « %s » et « %s » dans le fichier d'entrée" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" @@ -1697,7 +1697,7 @@ msgstr "" "le fichier d'entrée « %s » ne contient pas d'en-tête ayant une spécification " "de charset" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1706,17 +1706,17 @@ msgstr "" "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas d'en-tête " "avec la spécification d'un charset" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "AVERTISSEMENT: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1725,7 +1725,7 @@ msgstr "" "autres.\n" "Conversion de la sortie en UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1739,7 +1739,7 @@ msgstr "" "Pour sélectionner un encodage différent de sortie, utiliser l'option --to-" "code.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1752,12 +1752,12 @@ msgstr "" "La sortie de « %s » pourrait être incorrecte.\n" "Les ajustements nécessaires possibles sont:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- définir LC_ALL à une locale ayant l'encodage %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1768,7 +1768,7 @@ msgstr "" " puis appliquer « %s »,\n" " et convertir à noveau vers %s en utilisant « msgconv ».\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1781,7 +1781,7 @@ msgstr "" " puis appliquer « %s »,\n" " et convertir à nouveau vers %s en utlisant « msgconv ».\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1792,17 +1792,17 @@ msgstr "" "La sortie de « %s » pourrait être incorrecte.\n" "Un ajustement nécessaire possible est de définir LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "échec de conversion" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" "Le fichier d'entrée ne contient pas d'en-tête avec la spécification d'un " "charset" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1811,7 +1811,7 @@ msgstr "" "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui ne " "supporte pas cette conversion." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1820,11 +1820,11 @@ msgstr "" "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). Cette " "version a été compilée sans iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "type d'archive" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1849,7 +1849,7 @@ msgstr "" "exact n'est pas possible, un appariement flou permet de produire de\n" "meilleurs résultats. \n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1866,7 +1866,7 @@ msgstr "" " -C, --compendium=FICHIER librairie additionnelle de messages traduits,\n" " peut-être spécifié plus d'une fois\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1877,7 +1877,7 @@ msgstr "" " -U, --update mettre à jour le fichier def.po,\n" " ne rien faire si le fichier def.po est déjà à jour\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1907,7 +1907,7 @@ msgstr "" "Le suffixe d'archive est « ~ », à moins que défini à l'aide de --suffix ou par la variable\n" "d'environnement SIMPLE_BACKUP_SUFFIX\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1922,15 +1922,15 @@ msgstr "" " -v, --verbose diagnostiquer toute anomalie dans chaque FICHIER\n" " -q, --quiet, --silent supprimer les indicateurs de progression\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "ce message devrait définir les formes au pluriel" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "ce message ne devrait pas définir les formes au pluriel" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1939,11 +1939,11 @@ msgstr "" "%s lus %ld anciens + %ld références, %ld fusionnés, %ld approximatives, %ld " "manquants, %ld périmés.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " terminé.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s et les noms de fichiers explicites s'excluent mutuellement" @@ -2096,12 +2096,12 @@ msgstr "" " -u, --unique afficher seulement les messages unique,\n" " en écartant les duplicatas\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Usage: %s [OPTION] [DOMAINE] MSGID MSGID-PLURIEL VALEUR\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2110,7 +2110,7 @@ msgstr "" "Afficher en langue native la traduction d'un message textuel dont\n" "la forme grammaticale dépend d'un nombre\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2132,7 +2132,7 @@ msgstr "" " MSGID MSGID-PLURAL traduire le champ MSGID (singulier) / MSGID-PLURAL (pluriel)\n" " VALEUR choisir la forme singulier/pluriel selon la VALEUR\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2147,17 +2147,17 @@ msgstr "" "répertoire.\n" "Répertoire standard de recherche: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: AVERTISSEMENT: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2166,15 +2166,15 @@ msgstr "" "Le charset « %s » n'a pas un nom d'encodage portable.\n" "La conversion de messages vers le charset usager ne fonctionnera pas.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Poursuite du traitement, attendez-vous à des erreurs d'analyses." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Poursuite malgré tout." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2183,7 +2183,7 @@ msgstr "" "Charset « %s » n'est pas supporté. %s utilise iconv(),\n" "et iconv() ne supporte pas « %s ».\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2191,12 +2191,12 @@ msgstr "" "L'installation de GNU libiconv suivi de la réinstallation de GNU gettext\n" "devrait corriger ce problème.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2205,7 +2205,7 @@ msgstr "" "Charset « %s » n'est pas supporté. %s utilise iconv(),\n" "Cette version a été générée sans iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2238,79 +2238,79 @@ msgid "plural form has wrong index" msgstr "forme plurielle a un index erronée" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "trop d'erreurs, j'abandonne" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "séquence multi-octets invalide" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "séquence multi-octets incomplète à la fin du fichier" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "séquence multi-octets incomplète à la fin de la ligne" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "échec de iconv()" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "erreur lors de la lecture de « %s »" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "mot-clé « %s » inconnu" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "séquence de contrôle invalide" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "fin de fichier intempestive" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "fin de ligne intempestive" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "fichier \"%s\" est tronqué" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "fichier \"%s\" contient une chaîne qui se termine par un non NUL" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "le fichier \"%s\" n'est pas en format .mo pour GNU" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "fichier \"%s\" contient une chaîne qui se termine pas par un NUL, à %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "deux arguments attendus" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Usage: %s [OPTION] URL FICHIER-D-ENTRÉE\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2319,52 +2319,52 @@ msgstr "" "Recherche et sorties des contenus d'un URL. Si le URL ne peut être atteint,\n" "le FICHIER local est utilisé à la place.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "erreur d'écriture sur stdout" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "ne peut repérer un répertoire temporaire, essayer de définir $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "ne peut créer un répertoire temporaire en utilisant le patron « %s »" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "n'est pas un nom de classe Java valide: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "échec de création de « %s »" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "erreur pendant l'écriture du fichier « %s »" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "échec de compilation de la classe Java, essayer --verbose ou définir $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "erreur lors de l'ouverture de « %s » en écriture" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "un message à traduire ne doit pas contenir la séquence d'échappement « \\%c »" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2379,65 +2379,65 @@ msgstr "" "ASCII à la place.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "incapable de fabriquer le fichier « %s »" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "sortie standard" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: attention: constante caractère sans terminateur" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: attention: constante chaîne sans terminateur" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "ce fichier ne peut contenir des directives de domaine" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: définition de chaîne invalide" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: nombre manquant après #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: expression de chaîne invalide" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing interdit si production sur sortie standard" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ne peut fonctionner sans mots clés à rechercher" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "attention: « %s » sans classification pour « %s », le langage C sera présumé" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extraire les chaînes traduisibles de fichiers d'entrée donnés.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2446,7 +2446,7 @@ msgstr "" "Les arguments obligatoires pour la forme longue des options sont aussi\n" "obligatoires pour les formes courtes qui leur correspondent.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2461,14 +2461,14 @@ msgstr "" " -p, --output-dir=RÉPERTOIRE placer les fichiers de sortie dans le RÉPERTOIRE\n" "Si la sortie est -, la sortie est écrite sur la sortie standard.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2480,7 +2480,16 @@ msgstr "" " -C, --c++ identique à --language=C++\n" "Par défaut, le langage est deviné selon l'extension du nom du fichier.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2495,7 +2504,7 @@ msgstr "" " -c, --add-comments[=CLÉ] sauver le commentaire précédent possédant CLÉ,\n" " ou celui qui précède immédiatement le mot-clef\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2513,7 +2522,7 @@ msgstr "" " --debug fournir plus de détails sur la reconnaissance\n" " des chaînes de format\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2554,11 +2563,18 @@ msgstr "" " -m, --msgstr-prefix[=CHAÎNE] préfixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n" " -M, --msgstr-suffix[=CHAÎNE] suffixer les msgstr's par CHAÎNE, sinon \\« \\ »\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrée standard" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2568,7 +2584,7 @@ msgstr "" "GNU gettext: gettext(\"\") retourne l'en-tête\n" "avec la méta information, pas une chaîne vide.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "langage « %s » inconnu" diff --git a/po/gettext.pot b/po/gettext.pot index 2f29e0dfd..d8cf751df 100644 --- a/po/gettext.pot +++ b/po/gettext.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,230 +16,230 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -247,45 +247,45 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -298,7 +298,7 @@ msgid "" " to MSGID from TEXTDOMAIN\n" msgstr "" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -311,25 +311,25 @@ msgid "" "Standard search directory: %s\n" msgstr "" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -339,9 +339,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -349,47 +349,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -398,8 +398,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -408,7 +408,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -420,7 +420,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -432,7 +432,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -450,12 +450,12 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -474,7 +474,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -484,7 +484,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -527,7 +527,7 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -535,20 +535,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -559,7 +559,7 @@ msgid "" "match cannot be found, fuzzy matching is used to produce better diagnostics.\n" msgstr "" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -568,50 +568,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "" -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "" msgstr[1] "" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -624,7 +616,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -637,7 +629,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -669,7 +661,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -687,11 +679,11 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "" @@ -718,16 +710,16 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -737,14 +729,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -753,41 +745,41 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -797,7 +789,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -816,84 +808,84 @@ msgid "" " -F, --sort-by-file sort output by file location\n" msgstr "" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -902,7 +894,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -911,7 +903,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -920,7 +912,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -932,7 +924,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -942,7 +934,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -958,7 +950,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -966,7 +958,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -976,200 +968,208 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1200,7 +1200,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1218,18 +1218,18 @@ msgid "" " --sort-by-file sort output by file location\n" msgstr "" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1237,19 +1237,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1258,7 +1258,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1267,7 +1267,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1278,39 +1278,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1322,51 +1322,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1375,7 +1375,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1384,12 +1384,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1397,7 +1397,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1406,7 +1406,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1414,33 +1414,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1454,7 +1454,7 @@ msgid "" "cannot be found, fuzzy matching is used to produce better results.\n" msgstr "" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1465,7 +1465,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1473,7 +1473,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1490,7 +1490,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1500,26 +1500,26 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" msgstr "" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr "" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "" @@ -1624,19 +1624,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1649,7 +1649,7 @@ msgid "" " COUNT choose singular/plural form based on this value\n" msgstr "" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1659,57 +1659,57 @@ msgid "" "Standard search directory: %s\n" msgstr "" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -1740,129 +1740,129 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -1871,71 +1871,71 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -1945,19 +1945,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -1967,7 +1976,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -1978,7 +1987,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2001,18 +2010,25 @@ msgid "" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" msgstr "" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "" diff --git a/po/gl.gmo b/po/gl.gmo index de574d7fb..2e966d3bb 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 1b3dbdb6f..358703b4c 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.10.39\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-07-28 17:00+0200\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -19,197 +19,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro ao abrir \"%s\" para lectura" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "erro ao abrir \"%s\" para escribir" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "erro ao escribi-lo ficheiro \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Erro de sistema descoñecido" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opción `%s' é ambigua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opción `--%s' non permite ningún argumento\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opción `%c%s' non permite ningún argumento\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: a opción `%s' require un argumento\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción `--%s' descoñecida\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción `%c%s' descoñecida\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción ilegal -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción non válida -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: a opción require un argumento -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opción `-W %s' é ambigua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opción `-W %s' non permite ningún argumento\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "memoria esgotada" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "non se pode crea-lo ficheiro de saída \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "o número de especificacións de formato en `msgid' e `msgstr' non coincide" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "o número de especificacións de formato en `msgid' e `msgstr' non coincide" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -217,7 +217,7 @@ msgid "" msgstr "" "o número de especificacións de formato en `msgid' e `msgstr' non coincide" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -225,29 +225,29 @@ msgid "" msgstr "" "o número de especificacións de formato en `msgid' e `msgstr' non coincide" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "as especificacións de formato do argumento %lu non son as mesmas" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -259,45 +259,45 @@ msgstr "" "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n" "FIN DETERMINADO.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "demasiados argumentos" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "faltan argumentos" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Use `%s --help' para máis información.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -319,7 +319,7 @@ msgstr "" " [DOMINIO] MSGID obte-la mensaxe traducida correspondente a\n" " MSGID do DOMINIO\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -340,26 +340,26 @@ msgstr "" "que atopa no catálogo escollido.\n" "Directorio estándar de busca: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Comunique os erros a .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -369,9 +369,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -379,47 +379,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s son mutuamente excluíntes" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -428,8 +428,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -438,7 +438,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -450,7 +450,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -462,7 +462,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -501,12 +501,12 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "o criterio de selección indicado é imposible (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -541,7 +541,7 @@ msgstr "" "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n" "ficheiro para definilos. Mantéñense as posicións de tódolos ficheiros PO.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -551,7 +551,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -631,7 +631,7 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -639,20 +639,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "non se indicou ningún ficheiro de entrada" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "precísanse exactamente dous ficheiros de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -678,7 +678,7 @@ msgstr "" "un emparellamento exacto, úsase coincidencia difusa, de xeito que se produza\n" "un mellor diagnóstico.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -687,50 +687,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "esta mensaxe úsase mais non está definida..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...mais esta definición é semellante" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensaxe úsase mais non está definida en %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "aviso: esta mensaxe non se usa" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "atopouse %d erro grave" msgstr[1] "atopáronse %d erros graves" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definición de mensaxe duplicada" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...este é o lugar da primeira definición" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "téñense que indicar polo menos dous ficheiros" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -759,7 +751,7 @@ msgstr "" "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n" "ficheiro para definilos. Mantéñense as posicións de tódolos ficheiros PO.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -788,7 +780,7 @@ msgstr "" "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n" "ficheiro para definilos. Mantéñense as posicións de tódolos ficheiros PO.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -841,7 +833,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -880,11 +872,11 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "non se indicou ningún ficheiro de entrada" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "precísanse exactamente dous ficheiros de entrada" @@ -912,17 +904,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "faltan argumentos" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -932,14 +924,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -948,43 +940,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "faltan argumentos" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "téñense que indicar polo menos dous ficheiros" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -994,7 +986,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1034,84 +1026,84 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d mensaxe traducida" msgstr[1] "%d mensaxes traducidas" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traducción difusa" msgstr[1] ", %d traduccións difusas" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d mensaxe sen traducir" msgstr[1] ", %d mensaxes sen traducir" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1120,7 +1112,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1129,7 +1121,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1138,7 +1130,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1150,7 +1142,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1160,7 +1152,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1176,7 +1168,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1184,7 +1176,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1194,215 +1186,223 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "secuencia de control ilegal" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "esta mensaxe úsase mais non está definida en %s" msgstr[1] "esta mensaxe úsase mais non está definida en %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "esta mensaxe úsase mais non está definida en %s" msgstr[1] "esta mensaxe úsase mais non está definida en %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "falta o campo `%s' na cabeceira" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "o campo `%s' aínda ten o valor inicial por defecto" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n" "%*s aviso: a conversión de código de caracteres non vai funcionar" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "Falta o código de caracteres na cabeceira.\n" "A conversión da mensaxe ao código do usuario non vai funcionar.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n" "%*s aviso: a conversión de código de caracteres non vai funcionar" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n" "empregarase un prefixo" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "directiva `domain %s' ignorada" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definición de mensaxe duplicada" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...este é o lugar da primeira definición" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "entrada `msgstr' baleira ignorada" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "entrada `msgstr' difusa ignorada" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1433,7 +1433,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1472,18 +1472,18 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1491,19 +1491,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1512,7 +1512,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1521,7 +1521,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1532,39 +1532,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1576,52 +1576,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 #, fuzzy msgid "warning: " msgstr "%s: aviso: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1630,7 +1630,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1639,12 +1639,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1652,7 +1652,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1661,7 +1661,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1669,15 +1669,15 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1686,7 +1686,7 @@ msgstr "" "O código de caracteres \"%s\" non está soportado. %s depende de\n" "iconv(), e iconv() non soporta \"%s\".\n" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1695,12 +1695,12 @@ msgstr "" "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n" "Esta versión foi compilada sen iconv().\n" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" # src/msgmerge.c:324 -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1725,7 +1725,7 @@ msgstr "" "para producir mellores resultados. Os resultados escríbense na saída\n" "estándar a menos que se indique un ficheiro de saída.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1736,7 +1736,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1744,7 +1744,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1761,7 +1761,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1771,17 +1771,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensaxe úsase mais non está definida en %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensaxe úsase mais non está definida en %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1790,11 +1790,11 @@ msgstr "" "%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %" "ld, obsoletas %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " rematado.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s son mutuamente excluíntes" @@ -1912,19 +1912,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1946,7 +1946,7 @@ msgstr "" " MSGID MSGID-PLURAL traducir MSGID (singular) / MSGID-PLURAL (plural)\n" " CONTADOR escoller a forma singular/plural segundo este valor\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1961,17 +1961,17 @@ msgstr "" "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n" "Directorio estándar de busca: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: aviso: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -1980,15 +1980,15 @@ msgstr "" "O código de caracteres \"%s\" non ten un nome portable.\n" "A conversión da mensaxe ao código do usuario podería non funcionar.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Continuando de calquera xeito, espere atopar erros de análise." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Continuando de calquera xeito." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -1997,7 +1997,7 @@ msgstr "" "O código de caracteres \"%s\" non está soportado. %s depende de\n" "iconv(), e iconv() non soporta \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2005,12 +2005,12 @@ msgstr "" "Se instala GNU libiconv e logo reinstala o GNU gettext\n" "podería arranxarse o problema.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2019,7 +2019,7 @@ msgstr "" "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n" "Esta versión foi compilada sen iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2052,134 +2052,134 @@ msgid "plural form has wrong index" msgstr "a forma do plural ten un índice erróneo" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "demasiados erros, interrompendo" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "secuencia multibyte non válida" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "secuencia multibyte non válida" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "secuencia multibyte non válida" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "palabra chave \"%s\" descoñecida" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "secuencia de control ilegal" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "fin de ficheiro nunha cadea" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "fin de liña nunha cadea" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "ficheiro \"%s\" truncado" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "o ficheiro \"%s\" non está no formato .mo de GNU" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "demasiados argumentos" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "erro ao escribi-lo ficheiro \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "non se pode crea-lo ficheiro de saída \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "erro ao escribi-lo ficheiro \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "erro ao abrir \"%s\" para escribir" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2188,71 +2188,71 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "non se pode crea-lo ficheiro de saída \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "saída estándar" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: aviso: constante de tipo carácter non rematada" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: aviso: literal de cadea non rematada" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "este ficheiro non pode conter directivas de dominio" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "non se pode usar --join-existing cando a saída se escribe en stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext non funciona sen palabras chave polas que buscar" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2262,19 +2262,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2284,7 +2293,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2295,7 +2304,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2339,22 +2348,33 @@ msgstr "" " -V, --version amosa-la información da versión e saír\n" " -w, --width=NÚMERO establece-la anchura da páxina de saída\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrada estándar" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "linguaxe `%s' descoñecida" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "fallo ao desprazarse á posición %2$ld de \"%1$s\"" diff --git a/po/id.gmo b/po/id.gmo index fe35dc892..0c1693a72 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index d28653dfa..10670f5d4 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.35\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 1999-09-19 10:24+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -13,233 +13,233 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "kesalahan saat membuka \"%s\" untuk dibaca" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "kesalahan ketika membuka \"%s\" untuk ditulis" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "kesalahan ketika membaca \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "kesalahan saat menulis file \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "kesalahan ketika membaca \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Kesalahan sistem tak dikenal" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pilihan `%s' rancu\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: pilihan `--%s' tidak membolehkan argumen\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: pilihan `%c%s' tidak membolehkan argumen\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "pilihan %s: `%s' memerlukan sebuah argumen\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: pilihan tak dikenal `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: pilihan tak dikenal `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: pilihan ilegal -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: pilihan tidak valid -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pilihan `-W %s' rancu\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 #, fuzzy msgid "memory exhausted" msgstr "Memori habis" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "tidak dapat membuat file output \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "spesifikasi format untuk argumen %u tidak sama" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "spesifikasi format untuk argumen %u tidak sama" # ) -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,45 +250,45 @@ msgstr "" "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n" "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Ditulis oleh %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "terlalu banyak argumen" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "Argumen hilang" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih jauh.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -310,7 +310,7 @@ msgstr "" " [TEXTDOMAIN] MSGID mengambil pesan terjemahan yang sesuai\n" " untuk MSGID dari TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -332,26 +332,26 @@ msgstr "" "diterjemahkan.\n" "Direktori pencarian standar: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Laporkan kesalahan ke .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -361,9 +361,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -371,47 +371,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s dan %s adalah mutually exclusive" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -420,8 +420,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -430,7 +430,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -442,7 +442,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -454,7 +454,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -487,12 +487,12 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -525,7 +525,7 @@ msgstr "" "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n" "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -535,7 +535,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -607,7 +607,7 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -615,20 +615,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "tidak diberikan file input" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "dibutuhkan tepat 2 file input" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -652,7 +652,7 @@ msgstr "" "program anda. Bilamana tidak ditemukan kecocokan yang tepat, digunakan fuzzy\n" "matching untuk menghasilkan diagnostik yang lebih baik.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -661,49 +661,41 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "pesan ini digunakan tapi tidak didefinisikan..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...tetapi definisi ini serupa" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "peringatan: pesan ini tidak digunakan" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "ditemukan %d kesalahan fatal" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definisi pesan ganda" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...ini adalah lokasi definisi pertama" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "paling tidak dua file harus dispesifikasikan" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -730,7 +722,7 @@ msgstr "" "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n" "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -757,7 +749,7 @@ msgstr "" "komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n" "mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -804,7 +796,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -837,11 +829,11 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "tidak diberikan file input" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "dibutuhkan tepat 2 file input" @@ -869,17 +861,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "Argumen hilang" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -889,14 +881,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -905,43 +897,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "Argumen hilang" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "paling tidak dua file harus dispesifikasikan" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -951,7 +943,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -985,81 +977,81 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, fuzzy, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d pesan diterjemahkan" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, fuzzy, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d terjemahan fuzzy" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, fuzzy, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d pesan belum diterjemahkan" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1068,7 +1060,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1077,7 +1069,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1086,7 +1078,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1098,7 +1090,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1108,7 +1100,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1124,7 +1116,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1132,7 +1124,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1142,205 +1134,213 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "urutan kendali ilegal" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s" msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s" msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "headerfield `%s' tidak ada dalam header" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "header field `%s' harus dimulai di awal baris" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "beberapa field header masih memiliki nilai baku awal" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "field `%s' masih memiliki nilai baku awal" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "nama domain \"%s\" tidak sesuai dengan nama file" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "direktiv `domain %s' diabaikan" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definisi pesan ganda" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...ini adalah lokasi definisi pertama" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "masukan `msgstr' kosong diabaikan" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "masukan fuzzy `msgstr' diabaikan" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: peringatan: file source mengandung terjemahan fuzzy" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1371,7 +1371,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1404,18 +1404,18 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1423,19 +1423,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1444,7 +1444,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1453,7 +1453,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1464,39 +1464,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1508,51 +1508,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1561,7 +1561,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1570,12 +1570,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1583,7 +1583,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1592,7 +1592,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1600,33 +1600,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1649,7 +1649,7 @@ msgstr "" "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n" "ke stdout kecuali diberikan sebuah output file.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1660,7 +1660,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1668,7 +1668,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1685,7 +1685,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1695,17 +1695,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1714,11 +1714,11 @@ msgstr "" "%sMembaca %d lama + %d referensi, digabung %d, fuzzy %d, hilang %d, kuno %" "d.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " selesai.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s dan %s adalah mutually exclusive" @@ -1834,19 +1834,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1868,7 +1868,7 @@ msgstr "" " [TEXTDOMAIN] MSGID mengambil pesan terjemahan yang sesuai\n" " untuk MSGID dari TEXTDOMAIN\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1887,57 +1887,57 @@ msgstr "" "diterjemahkan.\n" "Direktori pencarian standar: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -1970,132 +1970,132 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "terlalu banyak kesalahan, dibatalkan" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "kesalahan ketika membaca \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "kata kunci \"%s\" tidak dikenal" -#: src/po-lex.c:935 +#: src/po-lex.c:856 #, fuzzy msgid "invalid control sequence" msgstr "urutan kendali ilegal" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "end-of-file dalam string" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "end-of-line dalam string" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "file \"%s\" terpotong" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "file \"%s\" bukan dalam format GNU .mo" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "file \"%s\" bukan dalam format GNU .mo" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "file \"%s\" bukan dalam format GNU .mo" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "terlalu banyak argumen" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "kesalahan saat menulis file \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "tidak dapat membuat file output \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "kesalahan saat menulis file \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "kesalahan ketika membuka \"%s\" untuk ditulis" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2104,71 +2104,71 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "tidak dapat membuat file output \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard output" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: peringatan: karakter konstan yang unterminated" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: peringatan: string literal yang unterminated" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "file ini tidak boleh mengandung direktiv domain" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "peringatan: file `%s' ekstensi `%s' tidak dikenal; dicoba C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2178,19 +2178,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2200,7 +2209,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2211,7 +2220,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2249,22 +2258,33 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "bahasa `%s' tidak dikenal" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "file \"%s\" bukan dalam format GNU .mo" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "gagal mencari \"%s\" offset %ld" diff --git a/po/it.gmo b/po/it.gmo index 4c19783a0..7c7e2cd28 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index a4951557f..b9669c3a8 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.35\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2000-02-17 15:30+01:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -14,198 +14,198 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "errore durante l'apertura in lettura di \"%s\"" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "errore durante l'apertura in scrittura di \"%s\"" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "errore durante la lettura di \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "errore durante la scrittura del file \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "errore durante la lettura di \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'opzione `%s' è ambigua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'opzione `--%s' non ammette un argomento\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'opzione `%c%s' non ammette un argomento\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'opzione `%s' richiede un argomento\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opzione `--%s' non riconosciuta\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opzione `%c%s' non riconosciuta\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opzione illegale -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opzione non valida -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'opzione `-W %s' è ambigua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'opzione `-W %s' non ammette un argomento\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 #, fuzzy msgid "memory exhausted" msgstr "Memoria esaurita" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "impossibile creare il file d'uscita \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -213,7 +213,7 @@ msgid "" msgstr "" "il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -221,29 +221,29 @@ msgid "" msgstr "" "il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,45 +255,45 @@ msgstr "" "NON c'è nessuna garanzia; neppure di COMMERCIABILITÀ o di IDONEITÀ AD UN\n" "PARTICOLARE SCOPO.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Scritto da %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "troppi argomenti" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "mancano degli argomenti" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare `%s --help' per ulteriori informazioni.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -316,7 +316,7 @@ msgstr "" " [DOMINIOTESTO] MSGID recupera da DOMINIOTESTO i messaggi tradotti\n" " corrispondenti a MSGID\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -338,26 +338,26 @@ msgstr "" "catalogo selezionato.\n" "Directory di ricerca standard: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Segnalare i bug a .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -367,9 +367,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -377,47 +377,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s sono mutuamente esclusive" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -426,8 +426,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -436,7 +436,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -448,7 +448,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -460,7 +460,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -497,12 +497,12 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -537,7 +537,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -547,7 +547,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -625,7 +625,7 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -633,20 +633,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "non sono specificati file d'ingresso" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "sono richiesti esattamente 2 file d'ingresso" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -671,7 +671,7 @@ msgstr "" "non è possibile trovare una corrispondenza esatta, sono usate le\n" "corrispondenze approssimative (fuzzy) per produrre diagnostiche migliori.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -680,49 +680,41 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "questo messaggio è usato ma non definito..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ma questa definizione è simile" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "questo messaggio è usato ma non è definito in %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "attenzione: questo messaggio non è usato" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "trovati %d errori fatali" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definizione del messaggio duplicata" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...questa è la posizione della prima definizione" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "devono essere specificati almeno due file" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -751,7 +743,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -780,7 +772,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -831,7 +823,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -868,11 +860,11 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "non è specificato nessun file d'ingresso" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "sono richiesti esattamente 2 file d'ingresso" @@ -900,17 +892,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "mancano degli argomenti" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -920,14 +912,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -936,43 +928,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "mancano degli argomenti" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "devono essere specificati almeno due file" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -982,7 +974,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1020,81 +1012,81 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, fuzzy, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d messaggi tradotti" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, fuzzy, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traduzioni approssimative" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, fuzzy, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d messaggi non tradotti" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1103,7 +1095,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1112,7 +1104,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1121,7 +1113,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1133,7 +1125,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1143,7 +1135,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1159,7 +1151,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1167,7 +1159,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1177,208 +1169,216 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "sequenza di controllo illegale" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "questo messaggio è usato ma non è definito in %s" msgstr[1] "questo messaggio è usato ma non è definito in %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "questo messaggio è usato ma non è definito in %s" msgstr[1] "questo messaggio è usato ma non è definito in %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "nell'intestazione manca il campo `%s'" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "" "il campo `%s' dell'intestazione dovrebbe cominciare all'inizio della riga" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "" "alcuni campi dell'intestazione sono ancora al valore iniziale predefinito" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "il campo `%s' ha ancora il valore iniziale predefinito" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "il nome di dominio \"%s\" non è adatto come nome di file" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n" "un prefisso" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domain %s' direttiva ignorata" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definizione del messaggio duplicata" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...questa è la posizione della prima definizione" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "ignorata la voce `msgstr' vuota" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ignorata la voce `msgstr' approssimativa" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1409,7 +1409,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1446,18 +1446,18 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1465,19 +1465,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1486,7 +1486,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1495,7 +1495,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1506,39 +1506,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1550,51 +1550,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1603,7 +1603,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1612,12 +1612,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1625,7 +1625,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1634,7 +1634,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1642,33 +1642,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1693,7 +1693,7 @@ msgstr "" "approssimativa (fuzzy) per ottenere risultati migliori. I risultati sono\n" "scritti su stdout a meno che non sia specificato un file d'uscita.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1704,7 +1704,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1712,7 +1712,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1729,7 +1729,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1739,17 +1739,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "questo messaggio è usato ma non è definito in %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "questo messaggio è usato ma non è definito in %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1758,11 +1758,11 @@ msgstr "" "%sLetti %d vecchi + %d riferimenti, fusi %d, fuzzy %d, persi %d, obsoleti %" "d.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " fatto.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s sono mutuamente esclusive" @@ -1881,19 +1881,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1916,7 +1916,7 @@ msgstr "" " [DOMINIOTESTO] MSGID recupera da DOMINIOTESTO i messaggi tradotti\n" " corrispondenti a MSGID\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1935,57 +1935,57 @@ msgstr "" "catalogo selezionato.\n" "Directory di ricerca standard: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2018,126 +2018,126 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "troppi errori, annullato" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "errore durante la lettura di \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "la parola chiave \"%s\" è sconoscita" -#: src/po-lex.c:935 +#: src/po-lex.c:856 #, fuzzy msgid "invalid control sequence" msgstr "sequenza di controllo illegale" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "end-of-file all'interno di una stringa" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "end-of-line all'interno di una stringa" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "file \"%s\" troncato" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "il file \"%s\" non è nel formato GNU .mo" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "il file \"%s\" non è nel formato GNU .mo" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "il file \"%s\" non è nel formato GNU .mo" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "troppi argomenti" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "errore durante la scrittura del file \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "impossibile creare il file d'uscita \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "errore durante la scrittura del file \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "errore durante l'apertura in scrittura di \"%s\"" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2145,7 +2145,7 @@ msgstr "" "i messaggi internazionalizzati non devono contenere la sequenza di escape `\\" "%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2154,72 +2154,72 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "impossibile creare il file d'uscita \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard output" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: attenzione: costante carattere non terminata" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: attenzione: letterale stringa non terminato" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "questo file potrebbe non contenere direttive di dominio" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing non può essere usato quando l'output è scritto su stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "attenzione: il file `%s' ha estensione `%s' sconosciuta: proverò con C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2229,19 +2229,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2251,7 +2260,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2262,7 +2271,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2304,22 +2313,33 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "linguaggio `%s' sconosciuto" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "il file \"%s\" non è nel formato GNU .mo" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "fallita ricerca di \"%s\" con offset %ld" diff --git a/po/ja.gmo b/po/ja.gmo index c23fe2da4..7aac9034e 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 191977c2b..82e4ea9c6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-09 00:00+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" @@ -14,236 +14,236 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "`%2$s' ¤ËÂФ¹¤ë°ú¿ô `%1$s' ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "`%2$s' ¤ËÂФ¹¤ë°ú¿ô `%1$s' ¤¬Û£Ëæ¤Ç¤¹" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Àµ¤·¤¤°ú¿ô:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë \"%s\" ¤ò½ñ¤­¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "\"%s\" ¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "\"%s\" ¤òÆɤ߹þ¤ó¤À¸å¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "̤ÃΤΥ·¥¹¥Æ¥à¥¨¥é¡¼" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: °ú¿ô¤¬É¬Íפʥª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "Java ¥³¥ó¥Ñ¥¤¥é¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gcj ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVAC ¤òÀßÄꤷ¤Æ¤ß" "¤Æ¤¯¤À¤µ¤¤" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Java ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gij ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVA ¤òÀßÄꤷ¤Æ¤¯" "¤À¤µ¤¤" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "¥Ñ¥¤¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬Ã×̿Ū¤Ê¥·¥°¥Ê¥ë %d ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "`msgid' ¤È `%s' ¤Ç»ØÄꤷ¤¿·Á¼°¤Î¿ô¤¬¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "" "°ú¿ô %2$u ¤ËÂФ¹¤ë 'msgid' ¤È '%1$s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "'msgid' ¤È '%s' ¤Ç¤Î°ú¿ô {%u} ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "`msgid' ¤È `%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬Åù¤·¤¯¤¢¤ê¤Þ¤»¤ó" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "'%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬ 'msgid' ¤Ç¤Î¥µ¥Ö¥»¥Ã¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "'msgid' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "'msgid' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë 'msgid' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "" "°ú¿ô '%2$s' ¤ËÂФ¹¤ë 'msgid' ¤È '%1$s' ¤Ç¤Î·Á¼°»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -259,33 +259,33 @@ msgstr "" "»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹çÀ­¤ÎÇ¡²¿¤Ë¤è¤é¤º, ¤¤¤«¤Ê¤ëÊݾڤ⤢¤ê¤Þ¤»¤ó.\n" "\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "ºî¼Ô %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï `%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -294,12 +294,12 @@ msgstr "" "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [[TEXTDOMAIN] MSGID]\n" "¤Þ¤¿¤Ï: %s [¥ª¥×¥·¥ç¥ó] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "¸¶Ê¸¤Î¥á¥Ã¥»¡¼¥¸¤Î¼«¹ñ¸ìËÝÌõ¤òɽ¼¨.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -320,7 +320,7 @@ msgstr "" " [TEXTDOMAIN] MSGID MSGID ¤Ë±þ¤¸¤¿ËÝÌõ¥á¥Ã¥»¡¼¥¸¤ò TEXTDOMAIN ¤«¤é\n" " ¼è¤ê½Ð¤¹\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -341,25 +341,25 @@ msgstr "" "ËÝÌõ¤µ¤ì¤¿¤â¤Î¤òɽ¼¨¤·¤Þ¤¹.\n" "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï ¤Þ¤Ç.\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "¥Þ¥·¥ó¤Î¥Û¥¹¥È̾¤òɽ¼¨.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -374,9 +374,9 @@ msgstr "" " ÊÌ̾ (¥¨¥¤¥ê¥¢¥¹) ¤ò´Þ¤à\n" " -i, --ip-address ¥Û¥¹¥È̾¤ËÂФ¹¤ë¥¢¥É¥ì¥¹\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -387,47 +387,47 @@ msgstr "" " -h, --help ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n" " -V, --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "ºÇÂç 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬µö¤µ¤ì¤Þ¤¹" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "°À­¤Ë½¾¤Ã¤ÆËÝÌõ¥«¥¿¥í¥°¤Î¥á¥Ã¥»¡¼¥¸¤òÁªÊ̤·, °À­¤ò¤¦¤Þ¤¯Áàºî¤·¤Þ¤¹.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -440,8 +440,8 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -453,7 +453,7 @@ msgstr "" " -o, --output-file=FILE »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -472,7 +472,7 @@ msgstr "" " --no-obsolete ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤òºï½ü\n" " --only-obsolete ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤ò»Ä¤¹\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -489,7 +489,7 @@ msgstr "" " --set-obsolete Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'ÇѤ줿' ¾õÂÖ¤ËÀßÄê\n" " --clear-obsolete Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'ÇѤ줿' ¾õÂ֤Ǥʤ¤¤â¤Î¤ËÀßÄê\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -520,12 +520,12 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n" @@ -553,7 +553,7 @@ msgstr "" "¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ\n" "¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -568,7 +568,7 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -637,7 +637,7 @@ msgstr "" " -s, --sort-output ʤÓÂؤ¨¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤Ç½ÐÎϤòʤÓÂؤ¨¤ë\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -648,20 +648,20 @@ msgstr "" " -h, --help ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n" " -V, --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "Àµ³Î¤Ë 2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -679,7 +679,7 @@ msgstr "" "Àµ³Î¤Ë°ìÃפ·¤Æ¤¤¤ë¸Ä½ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï, ¤¢¤¤¤Þ¤¤ (fuzzy) ¸¡º÷¤ò»È¤¦¤È\n" "¤è¤êÎɤ¤¿ÇÃÇ¥á¥Ã¥»¡¼¥¸¤¬ÆÀ¤é¤ì¤Þ¤¹.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -692,7 +692,7 @@ msgstr "" " ref.pot ¥½¡¼¥¹¤Ø¤Î»²¾È\n" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -701,43 +701,35 @@ msgstr "" "Áàºî»ØÄê:\n" " -m, --multi-domain ref.pot ¤ò def.po Æâ¤Î¥É¥á¥¤¥ó¤Î³Æ¡¹¤ËŬÍÑ\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...¤·¤«¤·¤³¤ÎÄêµÁ¤¬»÷¤Æ¤¤¤Þ¤¹" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ %s ¤Ç¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "·Ù¹ð: ¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤»¤ó" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" msgstr[1] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "¥á¥Ã¥»¡¼¥¸¤¬Æó½Å¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...¤³¤ì¤ÏºÇ½é¤ÎÄêµÁ¤Ë¤¢¤ê¤Þ¤¹" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "¾¯¤Ê¤¯¤È¤â 2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -757,7 +749,7 @@ msgstr "" "¥³¥á¥ó¥È¤Ï, ¤½¤ì¤é¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤Î¤ß¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" "¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -776,7 +768,7 @@ msgstr "" " -u, --unique --less-than=2 ¤Îû½Ì·Á. 1¤Ä¤·¤«¤Ê¤¤¥á¥Ã¥»¡¼¥¸\n" " ¤Î¤ß¤òɽ¼¨\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -825,7 +817,7 @@ msgstr "" " -t, --to-code=NAME ½ÐÎϤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n" "ɸ½à¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¸½ºß¤Î¥í¡¼¥«¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -856,11 +848,11 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "Àµ³Î¤Ë 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹" @@ -894,16 +886,16 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "¥³¥Þ¥ó¥É̾¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] ¥³¥Þ¥ó¥É [¥³¥Þ¥ó¥É¥ª¥×¥·¥ç¥ó]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -918,7 +910,7 @@ msgstr "" "¤½¤Î½ÐÎϤ¬ msgexec ¤Î½ÐÎϤˤʤê¤Þ¤¹. msgexec ¤Î½ªÎ»¥³¡¼¥É¤ÏÆâÉô¤«¤é¸Æ¤Ó\n" "½Ð¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Î½ªÎ»¥³¡¼¥É¤ÎºÇÂçÃͤˤʤê¤Þ¤¹.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -927,7 +919,7 @@ msgstr "" "'0' ¤È¤¤¤¦ÆÃÊ̤ÊÁȤ߹þ¤ß¥³¥Þ¥ó¥É¤ÏºÇ¸å¤Ë¥Ì¥ëʸ»ú¤òÉÕ¤±¤ÆËÝÌõ¤ò½ÐÎϤ·¤Þ¤¹.\n" "\"msgexec 0\" ¤Î½ÐÎÏ¤Ï \"xargs -0\" ¤Ø¤ÎÆþÎϤËŬ¤·¤Æ¤¤¤Þ¤¹.\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -940,34 +932,34 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "ɸ½à½ÐÎϤؤνñ¤­½Ð¤·¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "%s ¤Ø½ñ¤­½Ð¤¹¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "¥Õ¥£¥ë¥¿Ì¾¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "¾¯¤Ê¤¯¤È¤â 1¤Ä¤Î sed ¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] ¥Õ¥£¥ë¥¿ [¥Õ¥£¥ë¥¿¥ª¥×¥·¥ç¥ó]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "ËÝÌõ¥«¥¿¥í¥°¤ÎÁ´¤Æ¤ÎËÝÌõ¤Ë¥Õ¥£¥ë¥¿¤òŬÍÑ.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -976,7 +968,7 @@ msgstr "" "FILTER ¤È¤·¤Æ¤Ï, ɸ½àÆþÎϤ«¤éËÝÌõ¤òÆɤ߼è¤ê, ½¤Àµ¤·¤¿ËÝÌõ¤òɸ½à½ÐÎϤؽñ¤­½Ð¤¹\n" "Ǥ°Õ¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -990,7 +982,7 @@ msgstr "" " -f, --file=SCRIPTFILE SCRIPTFILE ¤ÎÆâÍƤò¼Â¹Ô¤µ¤ì¤ë¥³¥Þ¥ó¥É¤ËÄɲÃ\n" " -n, --quiet, --silent ¥Ñ¥¿¡¼¥ó¥¹¥Ú¡¼¥¹¤Î¼«Æ°Åª¤Êɽ¼¨¤òÍÞÀ©\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1023,81 +1015,81 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤Ë¥Ö¥í¥Ã¥­¥ó¥°¤·¤Ê¤¤Æþ½ÐÎϤòÀßÄê¤Ç¤­¤Þ¤»¤ó" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤È¤ÎÄÌ¿®¤Ë¼ºÇÔ" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬½ªÎ»¥³¡¼¥É %d ¤Ç½ªÎ»" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "%s ¤Ø¤Î°ú¿ô¤Ïñ°ì¤Î¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s ¤Ë¤Ï \"-d ¥Ç¥£¥ì¥¯¥È¥ê\" ¤Î»ØÄ꤬ɬÍפǤ¹" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s ¤Ë¤Ï \"-l ¥í¥«¡¼¥ë\" ¤Î»ØÄ꤬ɬÍפǤ¹" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s ¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s ¤Ï %s ¤Þ¤¿¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d ¸Ä¤ÎËÝÌõ¥á¥Ã¥»¡¼¥¸" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d ¸Ä¤ÎËÝÌõ¤¬¤¢¤¤¤Þ¤¤¤Ç¤¹" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d ¸Ä¤Î̤Ìõ¤Î¥á¥Ã¥»¡¼¥¸" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] filename.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò¸¶Ê¸¤ÎËÝÌõ¤Îµ­½Ò¤«¤éÀ¸À®.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1110,7 +1102,7 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1123,7 +1115,7 @@ msgstr "" " --java2 --java ¤ÈƱ¤¸¤Ç Java2 (JDK 1.2 °Ê¹ß) ¤ò²¾Äê\n" " --tcl Tcl ¥â¡¼¥É: tcl/msgcat .msg ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1136,7 +1128,7 @@ msgstr "" " --strict ¸·Ì©¤Ê Uniforum ¥â¡¼¥É¤òÍ­¸ú¤Ë\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1155,7 +1147,7 @@ msgstr "" "¤Ç·è¤á¤é¤ì¤Þ¤¹. -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. ¥¯¥é¥¹¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë\n" "½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1170,7 +1162,7 @@ msgstr "" "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­\n" "½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1198,7 +1190,7 @@ msgstr "" " ¥Á¥§¥Ã¥¯\n" " -f, --use-fuzzy fuzzy (¤¢¤¤¤Þ¤¤) ¹àÌܤò½ÐÎϤ˻Ȥ¦\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1209,7 +1201,7 @@ msgstr "" " -a, --alignment=NUMBER ʸ»úÎó¤ò NUMBER ¥Ð¥¤¥È¤Ë·¤¨¤ë (ɸ½à: %d)\n" " --no-hash ¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ï¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤ò´Þ¤Þ¤Ê¤¤\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1224,75 +1216,75 @@ msgstr "" " --statistics ËÝÌõ¤Ë´Ø¤¹¤ëÅý·×¾ðÊó¤òɽ¼¨\n" " -v, --verbose ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "Ê£¿ôɽ¸½¤¬Éé¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu ¤Ç¤¹¤¬Ê£¿ôɽ¸½¤¬ %lu ¤ÈƱ¤¸ÄøÅÙ¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "Ê£¿ôɽ¸½¤¬¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "Ê£¿ôɽ¸½¤¬À°¿ô¤¢¤Õ¤ì¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "Ê£¿ôɽ¸½¤¬±é»»Îã³°, ¤ª¤½¤é¤¯¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ËÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"plural=EXPRESSION\" °À­¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"nplurals=INTEGER\" °À­¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "ÉÔÀµ¤Ê nplurals ¤ÎÃÍ" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "ÉÔÀµ¤ÊÊ£¿ô (plural) ɽ¸½" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï 1¤Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹" msgstr[1] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï 1¤Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹" msgstr[1] "...¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "%s ¤Ë¤È¤Ã¤ÆÍ­¸ú¤Ê, ¼¡¤ò»È¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1300,125 +1292,133 @@ msgstr "" "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹. ¤·¤«¤· \"Plural-Forms: " "nplurals=INTEGER; plural=EXPRESSION;\" ¤È¤¤¤¦¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "`msgid' ¤È `msgid_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "`msgid' ¤È `msgstr_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' ¤È `msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' ¤È `msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "Ê£¿ô·Á¤ÎÀ©¸æ¤Ï GNU gettext ¤Î³ÈÄ¥¤Ç¤¹" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' ¤Ï 'msgid' ¤È°ã¤Ã¤ÆÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr ¤Ë¤Ï¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" "msgstr ¤Ë¤Ï¤¢¤Þ¤ê¤Ë¿¤¯¤Î¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤¹" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤¬¥Ø¥Ã¥À¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "¥Ø¥Ã¥À¾ðÊó `%s' ¤Ï¹ÔƬ¤Ë¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "¤¤¤¯¤Ä¤«¤Î¥Ø¥Ã¥À¾ðÊ󤬽é´üɸ½àÃͤΤޤޤǤ¹\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "¾ðÊó `%s' ¤¬½é´üɸ½àÃͤΤޤޤǤ¹\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤, ¤â¤·¤¯¤ÏÉÔÀµ¤Ç¤¹\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤¬µ¡Ç½¤·¤Þ¤»¤ó\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¥Ø¥Ã¥À¤¬¤¢¤¤¤Þ¤¤¤Ç¤¹\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "·Ù¹ð: msgfmt ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤³¤Ç¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó:\n" "ÀÜƬ¼­¤ò»È¤¤¤Þ¤¹" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`¥É¥á¥¤¥ó %s' Ì¿Îá¤Ï̵»ë¤µ¤ì¤Þ¤¹" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "¥á¥Ã¥»¡¼¥¸¤¬Æó½Å¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...¤³¤ì¤ÏºÇ½é¤ÎÄêµÁ¤Ë¤¢¤ê¤Þ¤¹" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "¶õ¤Î `msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "¤¢¤¤¤Þ¤¤ (fuzzy) ¤Ê `msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "¥ª¥×¥·¥ç¥ó '%c' ¤Ï 'K' ¤ä 'T' ¤¬»ØÄꤵ¤ì¤ëÁ°¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1427,7 +1427,7 @@ msgstr "" "ËÝÌõ¥«¥¿¥í¥°¤ÎÃ椫¤é, »ØÄꤵ¤ì¤¿¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë, ¤â¤·¤¯¤Ï»ØÄꤵ¤ì¤¿¤¤¤¯¤Ä\n" "¤«¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ëÁ´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1485,7 +1485,7 @@ msgstr "" " -f, --file=FILE PATTERN ¤ò FILE ¤«¤é»ØÄê\n" " -i, --ignore-case Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1516,11 +1516,11 @@ msgstr "" " --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "grep ¥µ¥Ö¥×¥í¥»¥¹¤Ø¤Î½ñ¤­½Ð¤·¤Ë¼ºÇÔ" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1529,7 +1529,7 @@ msgstr "" "¤¢¤Ê¤¿¤Ï¸À¸ì¤Ë´Ø¤ï¤ê¤Î¤Ê¤¤´Ä¶­¤Ë¤¤¤Þ¤¹. ABOUT-NLS ¤Ëµ­½Ò¤µ¤ì¤¿¤è¤¦¤Ë\n" "´Ä¶­ÊÑ¿ô LANG ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤. ¤³¤ì¤ÇËÝÌõ¤ò¥Æ¥¹¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1540,19 +1540,19 @@ msgstr "" "--locale ¥ª¥×¥·¥ç¥ó¤Ç¥í¥«¡¼¥ë¤ò»ØÄꤹ¤ë¤«, --output-file ¥ª¥×¥·¥ç¥ó¤Ç\n" "½ÐÎϤ¹¤ë .po ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "%s ¤òÀ¸À®.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "¿·¤·¤¤ PO ¥Õ¥¡¥¤¥ë¤òºîÀ®. ¥æ¡¼¥¶´Ä¶­¤«¤é¤ÎÃͤǥ᥿¾ðÊó¤ò½é´ü²½¤·¤Þ¤¹.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1565,7 +1565,7 @@ msgstr "" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ç POT ¥Õ¥¡¥¤¥ë¤¬¸¡º÷\n" "¤µ¤ì¤Þ¤¹. ¤â¤·ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Ê¤é¤Ðɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1578,7 +1578,7 @@ msgstr "" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç, ½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï --locale ¥ª¥×¥·¥ç¥ó¤«¥æ¡¼¥¶¤Î\n" "¥í¥«¡¼¥ëÀßÄê¤Ë°Í¸¤·¤Þ¤¹. ¤â¤· - ¤Ê¤é¤Ð·ë²Ì¤Ïɸ½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1594,7 +1594,7 @@ msgstr "" " -w, --width=NUMBER ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n" " --no-wrap ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤è¤êŤ¤¥á¥Ã¥»¡¼¥¸¹Ô¤ò²þ¹Ô¤·¤Ê¤¤\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1602,11 +1602,11 @@ msgstr "" "1¤Ä°Ê¾å¤Î .pot ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤Þ¤·¤¿.\n" "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1614,23 +1614,23 @@ msgstr "" "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë .pot ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿.\n" "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() ¼ºÇÔ" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹Æþ½ÐÎÏ¥¨¥é¡¼" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¼ºÇÔ, ½ªÎ»¥³¡¼¥É %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1647,28 +1647,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "¸½ºß¤Îʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "2¤Ä¤Î°Û¤Ê¤Ã¤¿Ê¸»ú¥»¥Ã¥È \"%s\" ¤È \"%s\" ¤¬ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ê¤Þ¤¹" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1677,18 +1677,18 @@ msgstr "" "ÆþÎÏ¥Õ¥¡¥¤¥ë `%2$s' Æâ¤Î¥É¥á¥¤¥ó \"%1$s\" ¤Ë¤Ïʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌÜ" "¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" "ÂоݤȤʤëʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "·Ù¹ð: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1696,7 +1696,7 @@ msgstr "" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤Ï°Û¤Ê¤Ã¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥á¥Ã¥»¡¼¥¸¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.\n" "½ÐÎϤò UTF-8 ¤ËÊÑ´¹¤·¤Þ¤¹.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1710,7 +1710,7 @@ msgstr "" "Ê̤νÐÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÁªÂò¤¹¤ë¾ì¹ç¤Ï --to-code ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ" "¤¤.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1723,12 +1723,12 @@ msgstr "" "'%s' ¤Î½ÐÎϤÏÉÔÀµ³Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹.\n" "²Äǽ¤Ê²óÈòºö:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- LC_ALL ¤ò¥¨¥ó¥³¡¼¥Ç¥£¥ó¥° %s ¤Î¥í¥«¡¼¥ë¤ËÀßÄê.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1739,7 +1739,7 @@ msgstr "" " ¤½¤Î¸å '%s' ¤òŬÍÑ.\n" " ¹¹¤Ë 'msgconv' ¤ò»È¤Ã¤Æ %s ¤ËÌ᤹.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1752,7 +1752,7 @@ msgstr "" " ¤½¤Î¸å '%s' ¤òŬÍÑ.\n" " ¹¹¤Ë 'msgconv' ¤ò»È¤Ã¤Æ %s ¤ËÌ᤹.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1763,15 +1763,15 @@ msgstr "" "'%s' ¤Î½ÐÎϤÏÉÔÀµ³Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹.\n" "²Äǽ¤Ê²óÈòºö¤È¤·¤Æ¤Ï LC_ALL=C ¤ÈÀßÄꤷ¤Þ¤¹.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "ÊÑ´¹¼ºÇÔ" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1780,7 +1780,7 @@ msgstr "" "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¤¬,iconv" "() ¤Ï¤³¤ÎÊÑ´¹¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1789,11 +1789,11 @@ msgstr "" "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹.¤³¤Î¥Ð¡¼" "¥¸¥ç¥ó¤Ï iconv() ¤Ê¤·¤Çºî¤é¤ì¤Æ¤¤¤Þ¤¹." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥¿¥¤¥×" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1815,7 +1815,7 @@ msgstr "" "»Ä¤µ¤ì¤Þ¤¹. Àµ³Î¤Ë°ìÃפ·¤Æ¤¤¤ë¸Ä½ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï, ¤¢¤¤¤Þ¤¤ (fuzzy)\n" "¸¡º÷¤ò»È¤¦¤È¤è¤êÎɤ¤·ë²Ì¤òÀ¸¤à¤Ç¤·¤ç¤¦. \n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1832,7 +1832,7 @@ msgstr "" " -C, --compendium=FILE ¥á¥Ã¥»¡¼¥¸ËÝÌõ¤ÎÄɲÃʸ¸¥\n" " 1²ó°Ê¾å»ØÄꤵ¤ì¤ë²ÄǽÀ­¤¢¤ê\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1843,7 +1843,7 @@ msgstr "" " -U, --update def.po ¤ò¹¹¿·\n" " def.po ¤¬´û¤ËºÇ¿·ÈǤǤ¢¤ì¤Ð²¿¤â¤·¤Ê¤¤\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1872,7 +1872,7 @@ msgstr "" "--suffix ¤ä´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð,\n" "¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤Ï `~' ¤Ç¤¹.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1887,15 +1887,15 @@ msgstr "" " -v, --verbose ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n" " -q, --quiet, --silent ¿Ê¹Ô¾õ¶·¤òɽ¼¨¤·¤Ê¤¤\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤¹" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1904,11 +1904,11 @@ msgstr "" "%s %ld(Á°¤ÎÈÇ) + %ld(¿·ÈÇ) ¤òÆɤ߹þ¤ß (¥Þ¡¼¥¸ %ld, ¤¢¤¤¤Þ¤¤ %ld, ·çÍî %ld, ÇË" "´þ %ld).\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " ´°Î».\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ¤ÈÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤ÏÇØÈ¿¤Ç¤¹" @@ -2056,19 +2056,19 @@ msgstr "" " -d, --repeated ½ÅÊ£¤·¤Æ¤¤¤ë¤â¤Î¤Î¤ß¤òɽ¼¨\n" " -u, --unique Í£°ì¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß¤òɽ¼¨¤·, ½ÅÊ£¤ò̵»ë\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "ʸˡ¾å, ·Á¼°¤¬¿ô¤Ë¤è¤Ã¤Æ°Û¤Ê¤Ã¤Æ¤¤¤ë¸¶Ê¸¥á¥Ã¥»¡¼¥¸¤Î¼«¹ñ¸ìËÝÌõ¤òɽ¼¨.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2089,7 +2089,7 @@ msgstr "" " MSGID MSGID-PLURAL MSGID (ñ¿ô·Á) / MSGID-PLURAL (Ê£¿ô·Á) ¤òËÝÌõ\n" " COUNT ¤³¤ÎÃͤò´ðËܤˤ·¤Æñ¿ô/Ê£¿ô·Á¤òÁªÂò\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2103,17 +2103,17 @@ msgstr "" "¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð, ´Ä¶­ÊÑ¿ô TEXTDOMAINDIR ¤Ç»ØÄꤵ¤ì¤¿¾ì½ê¤«¤éõ¤·¤Þ¤¹.\n" "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "<ɸ½àÆþÎÏ>" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: ·Ù¹ð: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2122,15 +2122,15 @@ msgstr "" "ʸ»ú¥»¥Ã¥È \"%s\" ¤ÏÈÆÍѤΥ¨¥ó¥³¡¼¥Ç¥£¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó.\n" "¥æ¡¼¥¶¤Îʸ»ú¥»¥Ã¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÑ´¹¤Ï¤¦¤Þ¤¯Æ¯¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹¤¬, ʸˡ¥¨¥é¡¼¤òµ¯¤³¤¹¤Ç¤·¤ç¤¦." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "¤È¤Ë¤«¤¯Â³¤±¤Þ¤¹." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2139,7 +2139,7 @@ msgstr "" "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹¤¬,\n" "iconv() ¤Ï \"%s\" ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2147,12 +2147,12 @@ msgstr "" "GNU libiconv ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é GNU gettext ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ì¤Ð\n" "¤³¤ÎÌäÂê¤Ï²ò·è¤¹¤ë¤Ç¤·¤ç¤¦.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2161,7 +2161,7 @@ msgstr "" "ʸ»ú¥»¥Ã¥È \"%s\" ¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Þ¤¹.\n" "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï iconv() ̵¤·¤Çºî¤é¤ì¤Þ¤·¤¿.\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2194,79 +2194,79 @@ msgid "plural form has wrong index" msgstr "Ê£¿ô·Á¤Ë´Ö°ã¤Ã¤¿º÷°ú¤¬¤¢¤ê¤Þ¤¹" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, ½èÍý¤òÂǤÁÀÚ¤ê¤Þ¤¹" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "ÉÔÀµ¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "¥Õ¥¡¥¤¥ë½ªÃ¼¤ËÉÔ´°Á´¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "¹ÔËö¤ËÉÔ´°Á´¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv ¤Î¼ºÇÔ" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "¥­¡¼¥ï¡¼¥É \"%s\" ¤ÏÃΤê¤Þ¤»¤ó" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ÉÔÀµ¤ÊÀ©¸æ¥·¡¼¥±¥ó¥¹" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "ʸ»úÎóÃæ¤Î end-of-file" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "ʸ»úÎóÃæ¤Î end-of-line" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤¬Ã»¤¯ÀÚ¤ê¼Î¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï GNU ¤Î .mo ·Á¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï %s ¤Ë½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "°ú¿ô¤Ï 2¤Ä¤Ç¤¹" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] URL ¥Õ¥¡¥¤¥ë\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2275,45 +2275,45 @@ msgstr "" "URL ¤ÎÆâÍƤò¼èÆÀ¤·½ÐÎϤ·¤Þ¤¹. ¤â¤·¤½¤Î URL ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤±¤ì¤Ð,\n" "¥í¡¼¥«¥ë¤Ë¥¢¥¯¥»¥¹²Äǽ¤Ê FILE ¤¬Âå¤ï¤ê¤Ë»È¤ï¤ì¤Þ¤¹.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "ɸ½à½ÐÎϤ˽ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¤Î¤Ç, $TMPDIR ¤òÀßÄꤷ¤Æ¤ß¤Æ¤¯¤À¤µ¤¤" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "¿÷·¿ \"%s\" ¤ò»È¤Ã¤Æ°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "Àµ¤·¤¤ Java ¥¯¥é¥¹Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤¹¤« $JAVAC ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "\"%s\" ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2321,7 +2321,7 @@ msgstr "" "¹ñºÝ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï `\\%c' ¤È¤¤¤¦¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ò´Þ¤ó¤Ç¤Ï¤¤¤±¤Þ¤»" "¤ó" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2335,64 +2335,64 @@ msgstr "" "¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\" ¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "ɸ½à½ÐÎÏ" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: ·Ù¹ð: ʸ»úÄê¿ô¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóÄêµÁ" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: # ¤Î¸å¤Ë¿ô»ú¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóɽ¸½" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing ¤Ï½ÐÎÏÀ褬ɸ½à½ÐÎϤξì¹ç¤Ë¤Ï»È¤¨¤Þ¤»¤ó" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë `%s' (³ÈÄ¥»Ò `%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2401,7 +2401,7 @@ msgstr "" "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n" "ɬ¿Ü¤Ç¤Ê¤¤°ú¿ô¤âƱ¤¸¤Ç¤¹.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2416,14 +2416,14 @@ msgstr "" " -p, --output-dir=DIR ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2435,7 +2435,16 @@ msgstr "" " -C, --c++ --language=C++ ¤Îû½Ì·Á\n" "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2450,7 +2459,7 @@ msgstr "" " -c, --add-comments[=TAG] TAG (¤Þ¤¿¤Ï¥­¡¼¥ï¡¼¥É¹Ô) ¤òÉÕ¤±¤Æ\n" " ¥³¥á¥ó¥ÈÉôʬ¤ò½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2467,7 +2476,7 @@ msgstr "" " -T, --trigraphs ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n" " --debug ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2508,11 +2517,18 @@ msgstr "" " -m, --msgstr-prefix[=STRING] msgstr ¹àÌܤÎÀÜƬ¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n" " -M, --msgstr-suffix[=STRING] msgstr ¹àÌܤÎÀÜÈø¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "ɸ½àÆþÎÏ" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2522,7 +2538,7 @@ msgstr "" "gettxt(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n" "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "¸À¸ì `%s' ¤ÏÃΤê¤Þ¤»¤ó" diff --git a/po/ko.gmo b/po/ko.gmo index 6c5c4d438..3b7e4cb87 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 7939a3623..91f505f91 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-08 12:26+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -15,235 +15,235 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "`%2$s'¿¡ ´ëÇÑ ÀÎÀÚ `%1$s'ÀÌ(°¡) À߸øµÇ¾ú½À´Ï´Ù" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "`%2$s'¿¡ ´ëÇÑ ÀÎÀÚ `%1$s'ÀÌ(°¡) ¾Ö¸ÅÇÕ´Ï´Ù" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "¿Ã¹Ù¸¥ ÀÎÀÚ´Â ´ÙÀ½°ú °°½À´Ï´Ù:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "Àбâ À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "¹é¾÷ ÆÄÀÏ \"%s\"À»(¸¦) ¾²±â À§ÇØ ¿­Áö ¸øÇß½À´Ï´Ù" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "\"%s\" ÆÄÀÏÀ» Àд µ¿¾È ¿À·ù ¹ß»ý" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "\"%s\" ÆÄÀÏÀ» ÀÐÀº ÈÄ¿¡ ¿À·ù ¹ß»ý" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s'Àº(´Â) ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "ÀÚ¹Ù ÄÄÆÄÀÏ·¯°¡ ¾ø½À´Ï´Ù. gcj¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "ÀÚ¹Ù °¡»ó±â°è°¡ ¾ø½À´Ï´Ù. gij¸¦ ¼³Ä¡Çϰųª $JAVAC ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³µ½À´Ï´Ù" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "ÆÄÀÌÇÁ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s ¼­ºêÇÁ·Î¼¼½º" # fatal signal ¹ø¿ª °³¼± -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Ä¡¸íÀûÀÎ ½Ã±×³Î %dÀ»(¸¦) ¹Þ¾Ò½À´Ï´Ù" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ¼­½Ä ÁöÁ¤ÀÚÀÇ °³¼ö°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ÀÎÀÚ %u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ %1$u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "ÀÎÀÚ %u¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ {%1$u}¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "ÀÎÀÚ {%u}¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "ÀÎÀÚ {%2$u}¿¡ ´ëÇÑ 'msgid'¿Í '%1$s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù" # ¿©±â¼­ equivalent¿¡ ´ëÇÑ Çؼ®Àº? -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ µ¿µîÇÏÁö ¾Ê½À´Ï´Ù" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "'%s' ¾È¿¡ ÀÖ´Â ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù" # mapping°ú tuple: python µ¥ÀÌŸ ±¸Á¶ -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "'msgid'ÀÇ ¼­½Ä ÁöÁ¤ÀÚ´Â ¸ÅÇÎÀÌ ÇÊ¿äÇѵ¥, '%s'¿¡´Â ÅÍÇÃÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "'msgid'ÀÇ ¼­½Ä ÁöÁ¤ÀÚ´Â ÅÍÇÃÀÌ ÇÊ¿äÇѵ¥, '%s'¿¡´Â ¸ÅÇÎÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ '%1$s'¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ ¼­½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ 'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -254,33 +254,33 @@ msgstr "" "ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n" "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "%sÀÌ(°¡) ¸¸µé¾ú½À´Ï´Ù.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "Àμö°¡ ³Ê¹« ¸¹À½" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "Àμö°¡ ºüÁ³À½" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -289,12 +289,12 @@ msgstr "" "»ç¿ë¹ý: %s [<¿É¼Ç>] [[] ]\n" "ȤÀº: %s [<¿É¼Ç>] -s []...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "ÁÖ¾îÁø ¸Þ¼¼Áö¿¡ ´ëÇÑ °íÀ¯¾î ¹ø¿ª¹®À» Ç¥½ÃÇÕ´Ï´Ù.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -315,7 +315,7 @@ msgstr "" " [] ¿¡ ´ëÀÀÇÏ´Â ¹ø¿ªµÈ ¸Þ½ÃÁö¸¦ ¿¡¼­\n" " ºÒ·¯¿É´Ï´Ù\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -336,25 +336,25 @@ msgstr "" "¸ñ·Ï¿¡¼­ ¹ø¿ªµÇ¾î ÀÖ´Â ¸Þ½ÃÁö¸¸ÀÌ Ãâ·ÂµË´Ï´Ù.\n" "±âº» Ž»ö µð·ºÅ丮: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "·Î ¹®Á¦Á¡À» ¾Ë·Á ÁֽʽÿÀ.\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "ÀÌ ±â°èÀÇ È£½ºÆ®À̸§À» Ç¥½ÃÇÕ´Ï´Ù.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -369,9 +369,9 @@ msgstr "" " Domain Name) ¹× º°¸í(alias)µéÀ» ¸ðµÎ Æ÷ÇÔ\n" " -i, --ip-address È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -382,32 +382,32 @@ msgstr "" " -h, --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "È£½ºÆ®À̸§À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "ÃÖ´ë ÇÑ °³ÀÇ ÀÔ·ÂÆÄÀϸ¸ÀÌ Çã¿ëµË´Ï´Ù" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s°ú(¿Í) %sÀº(´Â) ¼­·Î ¹èŸÀûÀÔ´Ï´Ù" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "»ç¿ë¹ý: %s [¿É¼Ç] [ÀÔ·ÂÆÄÀÏ]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -416,15 +416,15 @@ msgstr "" "¹ø¿ª ¸Þ¼¼ÁöµéÀ» ±× ¼Ó¼º¿¡ µû¶ó °É·¯³»°í, ±× ¼Ó¼ºÀ» Á¶ÀÛÇÕ´Ï´Ù.\n" "\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -437,8 +437,8 @@ msgstr "" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -451,7 +451,7 @@ msgstr "" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, °á°ú¹°À» Ç¥ÁØ Ãâ·ÂÀ¸·Î \n" "Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -470,7 +470,7 @@ msgstr "" " --no-obsolete ¾ø¾îÁø #~ ¸Þ¼¼Áö¸¦ Áö¿ó´Ï´Ù\n" " --only-obsolete ¾ø¾îÁø #~ ¸Þ¼¼Áö¸¦ ³ö µÓ´Ï´Ù\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -489,7 +489,7 @@ msgstr "" " --fuzzy \"--only-fuzzy --clear-fuzzy\"¿Í µ¿ÀÏÇÕ´Ï´Ù\n" " --obsolete \"--only-obsolete --clear-obsolete\"¿Í µ¿ÀÏÇÕ´Ï´Ù\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -520,12 +520,12 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "ºÒ°¡´ÉÇÑ ¼±Åà Á¶°ÇÀ» ÁöÁ¤ÇÏ¿´½À´Ï´Ù (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<ÀÔ·ÂÆÄÀÏ>]...\n" @@ -553,7 +553,7 @@ msgstr "" "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n" "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -567,7 +567,7 @@ msgstr "" " -f, --files-from=<ÆÄÀÏ> <ÆÄÀÏ>¿¡¼­ ÀÔ·Â ÆÄÀÏÀÇ ¸í´ÜÀ» ÀнÀ´Ï´Ù\n" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -638,7 +638,7 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -649,20 +649,20 @@ msgstr "" " -h, --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "Á¤È®È÷ 2°³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -680,7 +680,7 @@ msgstr "" "Á¤È®ÇÑ Â¦À» ãÁö ¸øÇÒ °æ¿ì, º¸´Ù ³ªÀº °á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö ¸ÅĪÀÌ »ç¿ëµË´Ï´Ù.\n" # references to sources ¹ø¿ª Àç°í -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -693,7 +693,7 @@ msgstr "" " ref.pot ¼Ò½º¿¡ ´ëÇÑ ÂüÁ¶\n" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -702,42 +702,34 @@ msgstr "" "µ¿ÀÛ º¯È­:\n" " -m, --multi-domain ref.pot ÆÄÀÏÀ» def.poÀÇ °¢ µµ¸ÞÀο¡ Àû¿ëÇÕ´Ï´Ù\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ÇÏÁö¸¸ ÀÌ Á¤ÀÇ´Â À¯»çÇÕ´Ï´Ù" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ %s¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "°æ°í: ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö ¾Ê½À´Ï´Ù" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "Áߺ¹µÈ ¸Þ½ÃÁö Á¤ÀÇ" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "ÃÖ¼ÒÇÑ µÎ °³ÀÇ ÆÄÀÏÀ» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -758,7 +750,7 @@ msgstr "" "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n" "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -779,7 +771,7 @@ msgstr "" " -u, --unique \"--less-than=2\"¸¦ ª°Ô ¾´ °ÍÀÔ´Ï´Ù, ÇÑ ¹ø¸¸\n" " ³ª¿À´Â ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -828,7 +820,7 @@ msgstr "" " -t, --to-code=<À̸§> Ãâ·ÂÀÇ ÀÎÄÚµù\n" "±âº» ÀÎÄÚµùÀº ÇöÀç ·ÎÄÉÀÏÀÇ ÀÎÄÚµùÀÔ´Ï´Ù.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -859,11 +851,11 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "Á¤È®È÷ ÇÑ °³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù" @@ -898,16 +890,16 @@ msgstr "" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "¸í·É¾î À̸§ÀÌ ºüÁ³½À´Ï´Ù" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] <¸í·É¾î> [<¸í·É¾î-¿É¼Ç>]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -922,7 +914,7 @@ msgstr "" "Ãâ·ÂÀº msgexecÀÇ Ãâ·ÂÀÌ µË´Ï´Ù. ÇÁ·Î±×·¥À» ¹ø¿ª¹®¸¶´Ù ½ÇÇàÇßÀ» ¶§ °¡Àå \n" "Å« ¸®ÅÏ Äڵ尡 msgexecÀÇ ¸®ÅÏ Äڵ尡 µË´Ï´Ù.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -931,7 +923,7 @@ msgstr "" "Ưº°È÷ ³»ºÎ ¸í·É¾î '0'Àº ¹ø¿ª¹®À» ±×´ë·Î Ãâ·ÂÇÏ°í, ¸Ç ³¡¿¡ 0 ³Î ¹ÙÀÌÆ®¸¦ \n" "Ãâ·ÂÇÕ´Ï´Ù. \"msgexec 0\"ÀÇ Ãâ·Â¹°Àº \"xargs -0\"ÀÇ ÀÔ·ÂÀ¸·Î »ç¿ëÇϱ⿡ ÀûÇÕÇÕ´Ï´Ù\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -944,34 +936,34 @@ msgstr "" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "ÇÊÅÍ À̸§ÀÌ ºüÁ³½À´Ï´Ù" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "ÃÖ¼ÒÇÑ ÇÑ °³ÀÇ sed ½ºÅ©¸³Æ®¸¦ ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] <ÇÊÅÍ> [<ÇÊÅÍ-¿É¼Ç>]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "¹ø¿ª ¸ñ·ÏÀÇ ¸ðµç ¹ø¿ª¹®¿¡ ´ëÇÏ¿© ÇÊÅ͸¦ Àû¿ëÇÕ´Ï´Ù.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -981,7 +973,7 @@ msgstr "" "Ãâ·ÂÇÏ´Â ÇÁ·Î±×·¥ÀÌ¸é ¾î¶² ÇÁ·Î±×·¥ÀÌµç °¡´ÉÇÕ´Ï´Ù.\n" # pattern space? -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -996,7 +988,7 @@ msgstr "" " Ãß°¡ÇÕ´Ï´Ù\n" " -n, --quiet, --silent ÆÐÅÏ °ø¹éÀ» ÀÚµ¿À¸·Î Ãâ·ÂÇÏÁö ¾Êµµ·Ï ÇÕ´Ï´Ù\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1029,81 +1021,81 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡ ºñÂ÷´Ü ÀÔÃâ·ÂÀ» ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿ÍÀÇ Åë½Å¿¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡¼­ ÀбⰡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d·Î(À¸·Î) ³¡³µ½À´Ï´Ù" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "%sÀÇ ÀÎÀÚ´Â ÇÑ °³ÀÇ ±¸µÎÁ¡ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%sÀº(´Â) \"-d µð·ºÅ丮\" ÁöÁ¤ÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%sÀº(´Â) \"-d ·ÎÄÉÀÏ\" ÁöÁ¤ÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%sÀº(´Â) %s°ú(¿Í) ÇÔ²² ½á¾ß¸¸ È¿°ú°¡ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%sÀº(´Â) %s ȤÀº %s°ú(¿Í) ÇÔ²² ½á¾ß¸¸ È¿°ú°¡ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "¹ø¿ªµÈ ¸Þ½ÃÁö %d°³" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", ÆÛÁö ¹ø¿ª¹® %d°³" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", ¹ø¿ªµÇÁö ¾ÊÀº ¸Þ½ÃÁö %d°³" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] ÆÄÀÏÀ̸§.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "ÁÖ¾îÁø ¹ø¿ª¹®¿¡¼­ ÀÌÁø ¸Þ¼¼Áö ¸ñ·Ï ÆÄÀÏÀ» ¸¸µé¾î ³À´Ï´Ù.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1116,7 +1108,7 @@ msgstr "" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" "ÀÔ·Â ÆÄÀÏÀÌ \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1129,7 +1121,7 @@ msgstr "" " --java2 --java¿Í °°Áö¸¸, Java2¸¦ °¡Á¤ÇÕ´Ï´Ù(JDK 1.2 ÀÌ»ó)\n" " --tcl Tcl ¸ðµå: tcl/msgcat .msg ÆÄÀÏÀ» ¸¸µì´Ï´Ù\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1141,7 +1133,7 @@ msgstr "" " -o, --output-file=<ÆÄÀÏ> ÁöÁ¤ÇÑ ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù\n" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ \"-\"ÀÎ °æ¿ì, °á°ú¹°À» Ç¥ÁØ Ãâ·ÂÀ¸·Î Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1160,7 +1152,7 @@ msgstr "" "À̸§À¸·Î °áÁ¤µË´Ï´Ù. -d ¿É¼ÇÀº ²À ÇÊ¿äÇÕ´Ï´Ù. Ŭ·¡½º´Â ÁöÁ¤ÇÑ µð·ºÅ丮\n" "¾Æ·¡¿¡ Ãâ·ÂµË´Ï´Ù.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1175,7 +1167,7 @@ msgstr "" "-l ¿É¼Ç°ú -d ¿É¼ÇÀº ²À ÇÊ¿äÇÕ´Ï´Ù. Ŭ·¡½º´Â ÁöÁ¤ÇÑ µð·ºÅ丮\n" "¾Æ·¡¿¡ Ãâ·ÂµË´Ï´Ù.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1203,7 +1195,7 @@ msgstr "" " °Ë»çÇÕ´Ï´Ù\n" " -f, --use-fuzzy Ãâ·Â¿¡ ÆÛÁö Ç׸ñÀ» »ç¿ëÇÕ´Ï´Ù\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1214,7 +1206,7 @@ msgstr "" " -a, --alignment=<Å©±â> ¹®ÀÚ¿­À» <Å©±â> ¹ÙÀÌÆ®¿¡ Á¤·ÄÇÕ´Ï´Ù(±âº»°ª: %d)\n" " --no-hash ÀÌÁø ÆÄÀÏ¿¡ Çؽ¬ Å×À̺íÀ» ³ÖÁö ¾Ê½À´Ï´Ù\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1229,24 +1221,24 @@ msgstr "" " --statistics ¹ø¿ª¿¡ ´ëÇÑ Åë°è¸¦ Ç¥½ÃÇÕ´Ï´Ù\n" " -v, --verbose ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "º¹¼ö Ç¥Çö½ÄÀÌ À½¼ö °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu ÇÏÁö¸¸ º¹¼ö Ç¥Çö½ÄÀÌ %lu¸¸Å­ Å« °ªÀ» ¸¸µé ¼öµµ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "º¹¼ö Ç¥Çö½ÄÀÌ 0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼öµµ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "º¹¼ö Ç¥Çö½ÄÀÌ Á¤¼ö ¿À¹öÇ÷ο츦 ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1254,49 +1246,49 @@ msgstr "" "º¹¼ö Ç¥Çö½ÄÀÌ ¿¬»ê ¿¹¿Ü¸¦ ¹ß»ý½Ãų ¼ö ÀÖ½À´Ï´Ù. 0À¸·Î ³ª´©´Â ¿¬»êÀ» ÇÒ ¼ö ÀÖ" "½À´Ï´Ù" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "¸Þ¼¼Áö ¸ñ·ÏÀº º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖ½À´Ï´Ù..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"plural=Ç¥Çö½Ä\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...ÇÏÁö¸¸ Çì´õ Ç׸ñ¿¡´Â \"nplurals=Á¤¼ö\" ¼Ó¼ºÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "nplurals °ªÀÌ À߸øµÇ¾ú½À´Ï´Ù" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "À߸øµÈ º¹¼ö Ç¥Çö½Ä" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö Çü¹Û¿¡ ¾ø½À´Ï´Ù" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...ÇÏÁö¸¸ ¾î¶² ¸Þ¼¼Áö´Â %lu°³ÀÇ º¹¼ö ÇüÀÌ ÀÖ½À´Ï´Ù" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "´ÙÀ½À» »ç¿ëÇØ º¸½Ê½Ã¿À. %s¿¡ ´ëÇؼ­ ¿Ã¹Ù¸§:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1304,122 +1296,130 @@ msgstr "" "¸Þ¼¼Áö ¸ñ·Ï¿¡ º¹¼öÇü ¹ø¿ªÀÌ µé¾î ÀÖÁö¸¸, Çì´õ Ç׸ñ¿¡ \"Plural-Forms: " "nplurals=Á¤¼ö; plural=Ç¥Çö½Ä;\"ÀÌ ¾ø½À´Ï´Ù" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid'¿Í `msgstr_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ½ÃÀÛÇÏÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid'¿Í `msgid_plural' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid'¿Í `msgstr[%u]' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid'¿Í `msgstr' Ç׸ñÀÌ ¸ðµÎ '\\n'À¸·Î ³¡³ªÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "º¹¼ö 󸮴 GNU gettext È®Àå ±â´ÉÀÔ´Ï´Ù" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'msgid'¿Í´Â ´Þ¸®, '%s'Àº(´Â) ¿Ã¹Ù¸¥ %s Çü½Ä ¹®ÀÚ¿­ÀÌ ¾Æ´Õ´Ï´Ù" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c'¿¡ ´ëÇÑ Ç¥½Ã°¡ ¾ø½À´Ï´Ù" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c' Ç¥½Ã°¡ ³Ê¹« ¸¹½À´Ï´Ù" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "Çì´õ¿¡ Çì´õ Çʵå `%s'ÀÌ(°¡) ºüÁ³À½\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "Çì´õ Çʵå `%s'Àº(´Â) ÇàÀÇ Ã³À½ºÎÅÍ ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "¸î¸î Çì´õ Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "`%s' Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ºüÁ³°Å³ª À߸øµÇ¾ú½À´Ï´Ù\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "°æ°í: ¹®Àڼ º¯È¯ÀÌ µ¿ÀÛÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ÆÛÁöÀÔ´Ï´Ù\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "°æ°í: °ú°Å ¹öÀüÀÇ msgfmtÀº ¿©±â¿¡ ¿À·ù¸¦ ³¾ °ÍÀÔ´Ï´Ù\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "µµ¸ÞÀÎÀ̸§ \"%s\"Àº(´Â) ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "µµ¸ÞÀÎÀ̸§ \"%s\"Àº(´Â) ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù. ±×·¯¹Ç·Î Á¢µÎ»ç¸¦\n" "»ç¿ëÇÒ °ÍÀÔ´Ï´Ù" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domain %s' Áö½ÃÀÚ´Â ¹«½ÃµÊ" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "Áߺ¹µÈ ¸Þ½ÃÁö Á¤ÀÇ" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "ºó `msgstr' Ç׸ñÀº ¹«½ÃµÊ" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ÆÛÁö `msgstr' Ç׸ñÀº ¹«½ÃµÊ" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "'%c' ¿É¼ÇÀº 'K'³ª 'T'°¡ ÁöÁ¤µÇ±â Àü¿¡´Â ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1428,7 +1428,7 @@ msgstr "" "¹ø¿ª ¸ñ·Ï¿¡¼­ ÁÖ¾îÁø ÆÐÅÏ¿¡ ¸Â´Â ¸Þ¼¼Áö ȤÀº ÁÖ¾îÁø ¼Ò½º ÆÄÀÏ¿¡ µé¾î ÀÖ´Â\n" "¸Þ¼¼Áö¸¸À» »Ì¾Æ ³À´Ï´Ù.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1485,7 +1485,7 @@ msgstr "" " -f, --file=<ÆÄÀÏ> \"ÆÐÅÏ\"À» <ÆÄÀÏ>¿¡¼­ °¡Á®¿É´Ï´Ù\n" " -i, --ignore-case ´ë¼Ò¹®ÀÚ ±¸º°À» ÇÏÁö ¾Ê½À´Ï´Ù\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1516,11 +1516,11 @@ msgstr "" " --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "grep ¼­ºê ÇÁ·Î¼¼½º¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1530,7 +1530,7 @@ msgstr "" "¿©·¯ºÐÀÇ LANG ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ. ¼¼ÆÃÇؾ߸¸ÀÌ ¿©·¯ºÐÀÇ\n" "¹ø¿ª¹®À» Å×½ºÆ®ÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1541,12 +1541,12 @@ msgstr "" "--locale ¿É¼ÇÀ¸·Î ·ÎÄÉÀÏÀ» ÁöÁ¤Çϰųª --output-file ¿É¼ÇÀ¸·Î\n" "Ãâ·Â .po ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "%sÀ»(¸¦) ¸¸µé¾ú½À´Ï´Ù.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1555,7 +1555,7 @@ msgstr "" "»õ·Î¿î PO ÆÄÀÏÀ» ¸¸µé°í, »ç¿ëÀÚÀÇ È¯°æ¿¡¼­ ¸ÞŸ Á¤º¸µéÀ»\n" "ÃʱâÈ­ÇÕ´Ï´Ù\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1568,7 +1568,7 @@ msgstr "" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, ÇöÀç µð·ºÅ丮¿¡¼­ POT ÆÄÀÏÀ» ã½À´Ï´Ù.\n" "ÀÔ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1581,7 +1581,7 @@ msgstr "" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, --locale ¿É¼ÇÀ̳ª »ç¿ëÀÚÀÇ ·ÎÄÉÀÏ ¼¼Æÿ¡\n" "µû¶ó °áÁ¤µË´Ï´Ù. Ãâ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·Â¿¡ ¾¹´Ï´Ù.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1598,7 +1598,7 @@ msgstr "" " --no-wrap Ãâ·Â ÆäÀÌÁö Æøº¸´Ù ±ä ¸Þ¼¼Áö ¶óÀÎÀ» ¿©·¯ ÁÙ·Î\n" " ÀÚ¸£Áö ¾Ê½À´Ï´Ù.\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1606,11 +1606,11 @@ msgstr "" "µÎ °³ ÀÌ»óÀÇ .pot ÆÄÀÏÀ» ã¾Ò½À´Ï´Ù.\n" "ÀÔ·Â .pot ÆÄÀÏÀ» --input ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "ÇöÀç µð·ºÅ丮¸¦ Àд µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1618,23 +1618,23 @@ msgstr "" "ÇöÀç µð·ºÅ丮¿¡¼­ .pot ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù.\n" "--input ¿É¼ÇÀ¸·Î ÀÔ·Â .pot ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen()ÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s ¼­ºêÇÁ·Î¼¼½º ÀÔÃâ·Â ¿À·ù" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d·Î(À¸·Î) ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1650,28 +1650,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "%s ÆÐÅ°Áö¿¡ ´ëÇÑ Çѱ¹¾î ¹ø¿ª¹®" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "ÇöÀç ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "ÀÔ·Â ÆÄÀÏ¿¡ µÎ °³ÀÇ ¹®Àڼ \"%s\"°ú(¿Í) \"%s\"ÀÌ(°¡) Á¸ÀçÇÕ´Ï´Ù" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "ÀÔ·Â ÆÄÀÏ `%s'¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1680,17 +1680,17 @@ msgstr "" "ÀÔ·Â ÆÄÀÏ `%2$s'ÀÇ µµ¸ÞÀÎ \"%1$s\"¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖ" "Áö ¾Ê½À´Ï´Ù" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "¸ñÇ¥ ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "°æ°í: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1698,7 +1698,7 @@ msgstr "" "ÀÔ·Â ÆÄÀÏÀº ¿©·¯ °³ÀÇ ÀÎÄÚµùÀ¸·Î µÈ ¸Þ¼¼Áö°¡ µé¾î ÀÖ°í, ±× ÁßÀÇ Çϳª°¡ \n" "UTF-8ÀÔ´Ï´Ù. Ãâ·ÂÀ» UTF-8À¸·Î º¯È¯ÇÕ´Ï´Ù.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1710,7 +1710,7 @@ msgstr "" "%sÀÌ(°¡) ÀÖ½À´Ï´Ù. Ãâ·ÂÀ» UTF-8À¸·Î º¯È¯ÇÕ´Ï´Ù.\n" "´Ù¸¥ Ãâ·Â ÀÎÄÚµùÀ» ¼±ÅÃÇÏ·Á¸é, --to-code ¿É¼ÇÀ» ¾²¼¼¿ä.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1723,12 +1723,12 @@ msgstr "" "'%s'·Î(À¸·Î) Ãâ·ÂÇÏ´Â °ÍÀÌ Æ²·ÈÀ» ¼ö ÀÖ½À´Ï´Ù.\n" "°¡´ÉÇÑ ÇØ°áÃ¥Àº:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- LC_ALL ȯ°æº¯¼ö¸¦ %s ÀÎÄÚµùÀ» ¾²´Â ·ÎÄÉÀÏ·Î ¼¼ÆÃÇϽʽÿÀ.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1739,7 +1739,7 @@ msgstr "" " ±× ´ÙÀ½ '%s'À»(¸¦) Àû¿ëÇÏ°í,\n" " ´Ù½Ã 'msgconv'¸¦ ÀÌ¿ëÇØ '%s'·Î(À¸·Î) º¯È¯ÇϽʽÿÀ\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1752,7 +1752,7 @@ msgstr "" " ±× ´ÙÀ½ '%s'À»(¸¦) Àû¿ëÇÏ°í,\n" " ´Ù½Ã 'msgconv'¸¦ ÀÌ¿ëÇØ '%s'·Î(À¸·Î) º¯È¯ÇϽʽÿÀ\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1763,15 +1763,15 @@ msgstr "" "'%s'·Î(À¸·Î) Ãâ·ÂÇÏ´Â °ÍÀÌ Æ²·ÈÀ» ¼ö ÀÖ½À´Ï´Ù.\n" "°¡´ÉÇÑ ÇØ°áÃ¥Àº \"LC_ALL=C\"·Î ¼¼ÆÃÇÏ´Â °ÍÀÔ´Ï´Ù.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "º¯È¯ ½ÇÆÐ" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "ÀÔ·Â ÆÄÀÏÀº ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1780,7 +1780,7 @@ msgstr "" "\"%s\"¿¡¼­ \"%s\"·Î(À¸·Î) º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö" "¸¸, iconv()°¡ ÀÌ°°Àº º¯È¯À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1790,11 +1790,11 @@ msgstr "" "¸¸,\n" "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "¹é¾÷ Á¾·ù" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1817,7 +1817,7 @@ msgstr "" "º¸Á¸µË´Ï´Ù. Á¤È®ÇÑ Â¦À» ãÁö ¸øÇÒ °æ¿ì, º¸´Ù ³ªÀº °á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö \n" "¸ÅĪÀÌ »ç¿ëµË´Ï´Ù.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1834,7 +1834,7 @@ msgstr "" " -C, --compendium=<ÆÄÀÏ> ¸Þ¼¼Áö ¹ø¿ª ¶óÀ̺귯¸® Ãß°¡,\n" " µÎ °³ ÀÌ»ó ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1845,7 +1845,7 @@ msgstr "" " -U, --update def.po¸¦ °»½ÅÇÕ´Ï´Ù,\n" " ÀÌ¹Ì def.po°¡ °»½ÅµÇ¾î ÀÖ´Ù¸é ¾Æ¹« °Íµµ ¾È ÇÕ´Ï´Ù\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1874,7 +1874,7 @@ msgstr "" "--suffix³ª SIMPLE_BACKUP_SUFFIX ȯ°æ º¯¼ö¸¦ ¼¼ÆÃÇÏÁö ¾Ê¾Ò´Ù¸é, ¹é¾÷\n" "Á¢¹Ì¾î´Â `~'ÀÔ´Ï´Ù.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1889,15 +1889,15 @@ msgstr "" " -v, --verbose ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n" " -q, --quiet, --silent ÁøÇà»óÅ ǥ½Ã¸¦ ÇÏÁö ¾Ê½À´Ï´Ù\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؾ߸¸ ÇÕ´Ï´Ù" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؼ­´Â ¾È µË´Ï´Ù" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1906,11 +1906,11 @@ msgstr "" "%s%ld°³ÀÇ ¿¹Àü °Í + %ld°³ÀÇ ÂüÁ¶¹®, °áÇÕµÈ °Í %ld, ÆÛÁö %ld, ºüÁø °Í %ld, ¾µ" "¸ð¾ø´Â °Í %ld°³¸¦ Àоú½À´Ï´Ù.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " ¿Ï·á.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s°ú(¿Í) ÆÄÀÏÀ̸§À» ¸í½ÃÀûÀ¸·Î ÁöÁ¤ÇÏ´Â °ÍÀº µ¿½Ã¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" @@ -2060,12 +2060,12 @@ msgstr "" " -d, --repeated Áߺ¹µÈ ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù\n" " -u, --unique À¯ÀÏÇÑ ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÏ°í, Áߺ¹µÈ °ÍÀº ¹ö¸³´Ï´Ù\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [] <°³¼ö>\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2074,7 +2074,7 @@ msgstr "" "¼ýÀÚ¿¡ µû¶ó ¹®¹ýÀÌ ´Þ¶óÁö´Â, ÁÖ¾îÁø ¸Þ¼¼Áö¿¡ ´ëÇÑ °íÀ¯¾î ¹ø¿ª¹®À»\n" "Ç¥½ÃÇÕ´Ï´Ù.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2096,7 +2096,7 @@ msgstr "" " MSGID MSGID-º¹¼öÇü MSGID(´Ü¼ö) / MSGID-º¹¼öÇü(º¹¼ö)À» ¹ø¿ªÇÕ´Ï´Ù\n" " °³¼ö ÀÌ °ª¿¡ µû¶ó ´Ü¼ö/º¹¼ö¸¦ °áÁ¤ÇÕ´Ï´Ù\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2111,17 +2111,17 @@ msgstr "" "\n" "Ç¥ÁØ Å½»ö µð·ºÅ丮: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "<Ç¥ÁØÀÔ·Â>" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: °æ°í: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2130,15 +2130,15 @@ msgstr "" "¹®Àڼ \"%s\"ÀÌ(°¡) °øÅëÀûÀ¸·Î ÀÌ¿ëÇÏ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù.\n" "»ç¿ëÀÚÀÇ ¹®ÀÚ¼ÂÀ¸·ÎÀÇ ¸Þ¼¼Áö º¯È¯Àº ÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù. ¹®¹ý ¾Ö·¯°¡ Ÿ³ª³¯ °ÍÀÔ´Ï´Ù." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "¾î·µç °è¼ÓÇÕ´Ï´Ù" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2147,7 +2147,7 @@ msgstr "" "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n" "iconv()´Â %sÀ»(¸¦) Áö¿øÇÏÁö ¾Ê½À´Ï´Ù.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2155,12 +2155,12 @@ msgstr "" "GNU libiconv¸¦ ¼³Ä¡ÇÏ°í GNU gettext¸¦ ´Ù½Ã ¼³Ä¡Çϸé ÀÌ\n" "¹®Á¦°¡ ¾øÀ» °ÍÀÔ´Ï´Ù.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2169,7 +2169,7 @@ msgstr "" "¹®Àڼ \"%s\"Àº(´Â) Áö¿øµÇÁö ¾Ê½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö¸¸,\n" "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù.\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2202,79 +2202,79 @@ msgid "plural form has wrong index" msgstr "º¹¼öÇüÀÇ À妽º°¡ À߸øµÇ¾ú½À´Ï´Ù" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Áß´ÜÇÕ´Ï´Ù" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "À߸øµÈ °¡º¯¹ÙÀÌÆ® ¹®ÀÚ¿­" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "ÆÄÀÏÀÇ ³¡¿¡¼­ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¹®ÀÚ¿­" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "ÁÙÀÇ ³¡¿¡¼­ ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¹®ÀÚ¿­" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv ½ÇÆÐ" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\"À»(¸¦) Àд µ¿¾È ¿À·ù ¹ß»ý" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "¾Ë ¼ö ¾ø´Â Å°¿öµå \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "À߸øµÈ Á¦¾î ¼ø¼­¿­" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÆÄÀÏÀÌ ³¡³²" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "¹®ÀÚ¿­ ³»ºÎ¿¡¼­ ÇàÀÌ ³¡³²" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "\"%s\" ÆÄÀÏÀÌ À߷ȽÀ´Ï´Ù" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "\"%s\" ÆÄÀÏ¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â ¹®ÀÚ¿­ÀÌ ÀÖ½À´Ï´Ù" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "\"%s\" ÆÄÀÏÀº GNU .mo Çü½ÄÀÌ ¾Æ´Õ´Ï´Ù" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "\"%s\" ÆÄÀÏÀÇ %s À§Ä¡¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â ¹®ÀÚ¿­ÀÌ ÀÖ½À´Ï´Ù" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "Àμö´Â µÎ °³À̾î¾ß ÇÕ´Ï´Ù" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] <ÆÄÀÏ>\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2283,52 +2283,52 @@ msgstr "" "URLÀÇ ³»¿ëÀ» °¡Á®¿Í¼­ Ãâ·ÂÇÕ´Ï´Ù. ¿¡ Á¢±ÙÇÒ ¼ö ¾ø´Â °æ¿ì¿¡´Â, ·ÎÄ®¿¡¼­ Á¢±ÙÇÒ ¼ö ÀÖ´Â\n" "<ÆÄÀÏ>ÀÌ ´ë½Å »ç¿ëµË´Ï´Ù.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µ¿¾È ¿À·ù ¹ß»ý" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "Àӽà µð·ºÅ丮°¡ ¾ø½À´Ï´Ù, $TMPDIR ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "Ʋ \"%s\"À»(¸¦) ÀÌ¿ëÇØ Àӽà µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "¿Ã¹Ù¸¥ Àڹ٠Ŭ·¡½º À̸§ÀÌ ¾Æ´Õ´Ï´Ù: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "\"%s\"À»(¸¦) ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "Àڹ٠Ŭ·¡½º ÄÄÆÄÀÏ¿¡ ½ÇÆÐÇß½À´Ï´Ù. --verbose·Î ½ÃµµÇØ º¸°Å³ª $JAVAC ȯ°æº¯¼ö" "¸¦ ¼¼ÆÃÇϽʽÿÀ" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "¾²±â À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "±¹Á¦È­µÈ ¸Þ½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2341,64 +2341,64 @@ msgstr "" "¹ß»ýÇÒ ¼ö ÀÖ½À´Ï´Ù. ¼ø¼öÇÑ ASCII msgid¸¸À» »ç¿ëÇϵµ·Ï ÇϽʽÿÀ.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "Ç¥ÁØ Ãâ·Â" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ »ó¼ö" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "ÀÌ ÆÄÀÏÀº µµ¸ÞÀÎ Áö½ÃÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: À߸øµÈ ¹®ÀÚ¿­ Á¤ÀÇ" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: # ´ÙÀ½¿¡ ¼ýÀÚ°¡ ºüÁ³½À´Ï´Ù" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: À߸øµÈ ¹®ÀÚ¿­ Ç¥Çö" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-exeistingÀº Ãâ·ÂÀÌ Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áú ¶§ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext´Â °Ë»öÇÒ Å°¿öµå ¾øÀÌ´Â µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'À»(¸¦) ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "ÁÖ¾îÁø ÀÔ·Â ÆÄÀÏ¿¡¼­ ¹ø¿ª °¡´ÉÇÑ ¹®ÀÚ¿­À» »Ì¾Æ³À´Ï´Ù.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2407,7 +2407,7 @@ msgstr "" "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n" "¾ø¾îµµ µÇ´Â ÀÎÀÚµµ ¸¶Âù°¡ÁöÀÔ´Ï´Ù.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2422,14 +2422,14 @@ msgstr "" " -p, --output-dir=<µð·ºÅ丮> Ãâ·Â ÆÄÀÏÀ» <µð·ºÅ丮> µð·ºÅ丮¿¡ ³õ½À´Ï´Ù\n" "Ãâ·ÂÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·ÂÀ¸·Î Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2441,8 +2441,17 @@ msgstr "" " -C, --c++ \"--language=C++\"À» ª°Ô ¾´ °ÍÀÔ´Ï´Ù\n" "±âº»ÀûÀ¸·Î ÀÔ·Â ÆÄÀÏÀÇ È®ÀåÀÚ¿¡ µû¶ó ¾ð¾î¸¦ ÃßÃøÇÕ´Ï´Ù\n" +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + # TAG°¡ Á¤È®ÀÌ ¹¹Áö? -#: src/xgettext.c:590 +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2457,7 +2466,7 @@ msgstr "" " -c, --add-comments[=<ű×>] ÁÖ¼® ºÎºÐÀ» <ÅÂÅ©>·Î (ȤÀº Å°¿öµå ÁÙ ¾Õ¿¡\n" " ÀÖ´Â °ÍÀ¸·Î) ¾¹´Ï´Ù\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2474,7 +2483,7 @@ msgstr "" " -T, --trigraphs ÀԷ¿¡¼­ ANSI C »ïÁßÀÚ(trigraph)¸¦ ÀνÄÇÕ´Ï´Ù\n" " --debug ´õ ÀÚ¼¼ÇÑ Çü½Ä¹®ÀÚ¿­ ÀÎ½Ä °á°ú\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2515,11 +2524,18 @@ msgstr "" " -m, --msgstr-prefix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢µÎ¾î·Î\n" " -M, --msgstr-suffix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢¹Ì¾î·Î\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "Ç¥ÁØ ÀÔ·Â" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2529,7 +2545,7 @@ msgstr "" "gettext(\"\")´Â ºó ¹®ÀÚ¿­ÀÌ ¾Æ´Ï¶ó, ¸ÞŸ Á¤º¸°¡ µé¾î ÀÖ´Â \n" "Çì´õ Ç׸ñÀ» ¸®ÅÏÇÕ´Ï´Ù.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "\"%s\" ÆÄÀÏ¿¡ NUL·Î ³¡³ªÁö ¾Ê´Â sysdep ¼¼±×¸ÕÆ®°¡ ÀÖ½À´Ï´Ù" diff --git a/po/nl.gmo b/po/nl.gmo index 21d7a285a..c11246d92 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index aadc7a6c0..54a94dae9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.31\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 1997-03-11 22:38 \n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -14,232 +14,232 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fout tijdens openen om te lezen van \"%s\"" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "fout bij openen om te schrijven van \"%s\"" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "fout tijdens lezen \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "fout bij schrijven bestand \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "fout tijdens lezen \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Onbekende systeemfout" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: optie `%s' is ambiguous\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: optie `--%s' verwacht geen argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: optie `%c%s' verwacht geen argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: optie `%s' verwacht een argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: onbekende optie `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: optie verwacht een argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: optie `-W %s' is dubbelzinnig\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `-W %s' staat geen argument toe\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 #, fuzzy msgid "memory exhausted" msgstr "Geen geheugen meer beschikbaar" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "kan uitvoerbestand \"%s\" niet aanmaken" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -251,45 +251,45 @@ msgstr "" "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n" "SPECIFIEK DOEL.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Geschreven door %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "te veel argumenten" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "ontbrekende argumenten" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -311,7 +311,7 @@ msgstr "" " [TEXTDOMEIN] MSGID ontvang vertaalde meldingen corresponderend aan\n" " MSGID vanuit TEKSTDOMEIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -333,26 +333,26 @@ msgstr "" "worden de in de katalogus gevonden meldingen vertaald.\n" "Standaard zoek directory: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Meld fouten via .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -362,9 +362,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -372,47 +372,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s en %s zijn mutually exclusive" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -421,8 +421,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -431,7 +431,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -443,7 +443,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -455,7 +455,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -489,12 +489,12 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -513,7 +513,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -523,7 +523,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -582,7 +582,7 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -590,20 +590,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "geen invoerbestanden gegeven" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "precies 2 invoerbestanden zijn benodigd" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -628,7 +628,7 @@ msgstr "" "overeenkomst niet gevonden kan wrden, zal fuzzy(vage) matching worden gebruikt,\n" "ter verkrijging van een betere diagnose.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -637,49 +637,41 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "deze melding is gebruikt maar is niet gedefinieerd..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...maar de definitie is gelijksoortig" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "waarschuwing: deze melding is niet gebruikt" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d fatale fouten gevonden" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "dubbele melding definitie" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...dit is de lokatie van de eerste definitie" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -692,7 +684,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -705,7 +697,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -753,7 +745,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -787,11 +779,11 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "geen invoerbestand gegeven" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "precies 2 invoerbestanden zijn benodigd" @@ -819,17 +811,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "ontbrekende argumenten" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -839,14 +831,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -855,42 +847,42 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "ontbrekende argumenten" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -900,7 +892,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -935,81 +927,81 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, fuzzy, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d vertaalde meldingen" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, fuzzy, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d vage vertalingen" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, fuzzy, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d onvertaalde meldingen" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1018,7 +1010,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1027,7 +1019,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1036,7 +1028,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1048,7 +1040,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1058,7 +1050,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1074,7 +1066,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1082,7 +1074,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1092,209 +1084,217 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "illegale kontrol sequence" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s" msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s" msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "header(??)veld `%s' ontbreekt in header(??)" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "header(??)veld `%s' moet starten aan het begin van de regel" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "" "sommige header(??)velden hebben nog de oorspronkelijke standaard waarde" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domeinnaam \"%s\" niet bruikbaar als bestandsnaam" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "domeinnaam \"%s\" niet bruikbaar als bestandsnaam: zal voorvoegsel gebruiken" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domein %s' directive genegeerd" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "dubbele melding definitie" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...dit is de lokatie van de eerste definitie" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "lege `msgstr' entry genegeerd" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "lege `msgstr' ingang genegeerd" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1325,7 +1325,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1359,18 +1359,18 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1378,19 +1378,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1399,7 +1399,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1408,7 +1408,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1419,39 +1419,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1463,51 +1463,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1516,7 +1516,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1525,12 +1525,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1538,7 +1538,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1547,7 +1547,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1555,33 +1555,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1606,7 +1606,7 @@ msgstr "" "worden om betere resultaten te verkrijgen. De resultaten worden naar \n" "standaarduitvoer geschreven tenzij een uitvoerbestand is gespecificeerd.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1617,7 +1617,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1625,7 +1625,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1642,7 +1642,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1652,17 +1652,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1671,11 +1671,11 @@ msgstr "" "%sLees %d oud + %d referentie, samengevoegd %d, fuzzied(gevaagd) %d, " "ontbrekend %d, overbodig %d.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s en %s zijn mutually exclusive" @@ -1793,19 +1793,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1827,7 +1827,7 @@ msgstr "" " [TEXTDOMEIN] MSGID ontvang vertaalde meldingen corresponderend aan\n" " MSGID vanuit TEKSTDOMEIN\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1846,57 +1846,57 @@ msgstr "" "worden de in de katalogus gevonden meldingen vertaald.\n" "Standaard zoek directory: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, fuzzy, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 #, fuzzy msgid "" "Charset missing in header.\n" @@ -1930,136 +1930,136 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "te veel fouten, afgebroken" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 #, fuzzy msgid "invalid multibyte sequence" msgstr "illegale kontrol sequence" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "illegale kontrol sequence" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "illegale kontrol sequence" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "fout tijdens lezen \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "sleutelwoord \"%s\" onbekend" -#: src/po-lex.c:935 +#: src/po-lex.c:856 #, fuzzy msgid "invalid control sequence" msgstr "illegale kontrol sequence" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "einde-bestand-teken in string" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "einde-regel-teken in string" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "bestand \"%s\" ingekort" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "bestand \"%s\" is geen GNU .mo bestand" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "bestand \"%s\" is geen GNU .mo bestand" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "bestand \"%s\" is geen GNU .mo bestand" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "te veel argumenten" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "fout bij schrijven bestand \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "kan uitvoerbestand \"%s\" niet aanmaken" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "fout bij schrijven bestand \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "fout bij openen om te schrijven van \"%s\"" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2068,74 +2068,74 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan uitvoerbestand \"%s\" niet aanmaken" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standaard uitvoer" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: let op: niet getermineerde karakter konstante" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: let op: niet getermineerde string literal" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "dit bestand mag geen domein directives bevatten" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan niet gebruikt worden indien uitvoer naar " "standaarduitvoer\n" "wordt geschreven" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "let op: bestand `%s' extensie `%s' is onbekend; ga C proberen" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2145,19 +2145,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2167,7 +2176,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2178,7 +2187,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2217,22 +2226,33 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standaard invoer" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "taal `%s' onbekend" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "bestand \"%s\" is geen GNU .mo bestand" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "zoek \"%s\" offset %ld gefaald" diff --git a/po/nn.gmo b/po/nn.gmo index 6f28d54b1..1434060f9 100644 Binary files a/po/nn.gmo and b/po/nn.gmo differ diff --git a/po/nn.po b/po/nn.po index 46be0d1d8..48b3af859 100644 --- a/po/nn.po +++ b/po/nn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.12\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 1996-03-21 08:46 EST\n" "Last-Translator: Karl Anders Øygard \n" "Language-Team: Norwegian-nynorsk \n" @@ -14,197 +14,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, fuzzy, c-format msgid "error while opening \"%s\" for reading" msgstr "feil under skriving av fila \"%s\"" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "feil under skriving av fila \"%s\"" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "feil under skriving av fila \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "feil under skriving av fila \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "feil under skriving av fila \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flagg «%s» er fleirtydig\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flagg «--%s» tek ikkje argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flagg «%c%s» tek ikkje argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flagg «%s» treng eit argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, fuzzy, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ulovleg flagg -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, fuzzy, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ulovleg flagg -- %c\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovleg flagg -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, fuzzy, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ulovleg flagg -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flagg treng eit argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, fuzzy, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flagg «%s» er fleirtydig\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, fuzzy, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flagg «--%s» tek ikkje argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "kan ikkje opprette utfila \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -212,7 +212,7 @@ msgid "" msgstr "" "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -220,29 +220,29 @@ msgid "" msgstr "" "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,46 +250,46 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 #, fuzzy msgid "too many arguments" msgstr "manglar argument" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "manglar argument" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, fuzzy, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for meir informasjon\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -311,7 +311,7 @@ msgstr "" " [TEXTDOMAIN] MSGID hent oversett melding som stemmer overeins med\n" " MSGID frå TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -333,25 +333,25 @@ msgstr "" "staden vert meldingar som er funne i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -361,9 +361,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -371,47 +371,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s utelukker kvarandre" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -420,8 +420,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -430,7 +430,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -442,7 +442,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -454,7 +454,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -481,12 +481,12 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -505,7 +505,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -515,7 +515,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -567,7 +567,7 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -575,21 +575,21 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 #, fuzzy msgid "no input files given" msgstr "inga innfil spesifisert" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "treng nøyaktig to innfiler" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -611,7 +611,7 @@ msgstr "" "oversett alle meldingar i programmet. Der samsvar ikkje kan finnast, vert\n" "«fuzzy» samanlikning brukt for å få betre diagnostikk.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -620,50 +620,41 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "denne meldinga er brukt, men ikkje definert..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "... men denne definisjonen liknar" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "advarsel: denne meldinga er ikkje brukt" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "fann %d fatale feil" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -#, fuzzy -msgid "...this is the location of the first definition" -msgstr "den første definisjonen finst her" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -676,7 +667,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -689,7 +680,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -730,7 +721,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -757,11 +748,11 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "inga innfil spesifisert" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "treng nøyaktig to innfiler" @@ -789,17 +780,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "manglar argument" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -809,14 +800,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -825,42 +816,42 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "manglar argument" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -870,7 +861,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -898,84 +889,84 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] "" msgstr[1] "" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -984,7 +975,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -993,7 +984,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1002,7 +993,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1014,7 +1005,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1024,7 +1015,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1040,7 +1031,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1048,7 +1039,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1058,205 +1049,214 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "denne meldinga er brukt, men ikkje definert i %s" msgstr[1] "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "denne meldinga er brukt, men ikkje definert i %s" msgstr[1] "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 #, fuzzy msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 #, fuzzy msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "filhovud-feltet «%s» manglar i filhovud" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "nokre filhovud-felt har framleis sin initielle verdi" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "feltet «%s» har framleis sin forvalgte verdi" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domenenamnet \"%s\" passar ikkje som filnavn" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +#, fuzzy +msgid "...this is the location of the first definition" +msgstr "den første definisjonen finst her" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, fuzzy, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1287,7 +1287,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1314,18 +1314,18 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1333,19 +1333,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1354,7 +1354,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1363,7 +1363,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1374,39 +1374,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1418,51 +1418,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1471,7 +1471,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1480,12 +1480,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1493,7 +1493,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1502,7 +1502,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1510,33 +1510,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1561,7 +1561,7 @@ msgstr "" "resultat. Resultatet vert skrive til standard ut, med mindre ei utfil er\n" "spesifisert.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1572,7 +1572,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1580,7 +1580,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1597,7 +1597,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1607,17 +1607,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1626,11 +1626,11 @@ msgstr "" "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n" "utdaterte %d.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr "" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og %s utelukker kvarandre" @@ -1744,19 +1744,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1778,7 +1778,7 @@ msgstr "" " [TEXTDOMAIN] MSGID hent oversett melding som stemmer overeins med\n" " MSGID frå TEXTDOMAIN\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1797,57 +1797,57 @@ msgstr "" "staden vert meldingar som er funne i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -1880,133 +1880,133 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 #, fuzzy msgid "too many errors, aborting" msgstr "for mange feil, avsluttar" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, fuzzy, c-format msgid "error while reading \"%s\"" msgstr "feil under skriving av fila \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "filen \"%s\" er avkutta" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "fila \"%s\" er ikkje i GNU .mo-format" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "fila \"%s\" er ikkje i GNU .mo-format" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "fila \"%s\" er ikkje i GNU .mo-format" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "manglar argument" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "feil under skriving av fila \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "kan ikkje skifte tilbake til filkatalog \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "feil under skriving av fila \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, fuzzy, c-format msgid "error while opening \"%s\" for writing" msgstr "feil under skriving av fila \"%s\"" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2015,72 +2015,72 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikkje opprette utfila \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "denne fila kan ikkje innehalde domene-nøkkelord" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan ikkje brukast når utdata vert skrive til standard ut" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2090,19 +2090,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2112,7 +2121,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2123,7 +2132,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2155,22 +2164,33 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "fila \"%s\" er ikkje i GNU .mo-format" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "«seek» \"%s\" posisjon %ld feila" diff --git a/po/no.gmo b/po/no.gmo index e35511f8a..b424a350a 100644 Binary files a/po/no.gmo and b/po/no.gmo differ diff --git a/po/no.po b/po/no.po index 65d2604f3..6fda22259 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-05-09 02:08+02:00\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian-bokmål \n" @@ -14,221 +14,221 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "feil under åpning av «%s» for lesing" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "feil under åpning av «%s» for skriving" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "feil under lesing av «%s»" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "feil under skriving av filen «%s»" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "feil under lesing av «%s»" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Ukjent systemfeil" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flagget «%s» er flertydig\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flagget «--%s» tillater ikke argumenter\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flagget «%c%s» tillater ikke argumenter\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flagget «%s» krever et argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukjent flagg «--%s»\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukjent flagg «%c%s»\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovlig flagg -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldig flagg -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flagg krever et argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flagg «-W %s» er flertydig\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flagg «-W %s» tillater ikke et argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "minnet oppbrukt" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "kan ikke opprette utfilen «%s»" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "format-spesifiseringene for argument %lu er ulike" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -236,11 +236,11 @@ msgstr "format-spesifiseringene for argument %lu er ulike" # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med? # Er denne oversettelsen grei nok? -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -252,45 +252,45 @@ msgstr "" "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT\n" "FORMÅL.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Skrevet av %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "for mange argumenter" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "mangler argumenter" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for mer informasjon.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -312,7 +312,7 @@ msgstr "" " [TEXTDOMAIN] MSGID hent oversatt melding som stemmer overens med MSGID\n" " fra TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -334,26 +334,26 @@ msgstr "" "stedet blir funne meldinger i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Rapporter feil til .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -363,9 +363,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -373,47 +373,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s utelukker hverandre" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -422,8 +422,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -432,7 +432,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -444,7 +444,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -456,7 +456,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -491,12 +491,12 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "umulig utvalgskriterie angitt (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -531,7 +531,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -541,7 +541,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -617,7 +617,7 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -625,20 +625,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ingen innfiler angitt" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "trenger nøyaktig to innfiler" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -661,7 +661,7 @@ msgstr "" "alle meldingene i programmet ditt. Når en eksakt overensstemmelse ikke\n" "finnes, blir «fuzzy»-sammenligning brukt for å få en bedre diagnostikk.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -670,50 +670,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "denne meldingen er brukt, men ikke definert..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "... men denne definisjonen ligner" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "denne meldingen er brukt, men ikke definert i %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "advarsel: denne meldingen er ikke brukt" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "fant %d fatale feil" msgstr[1] "fant %d fatale feil" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "duplisert definisjon av melding" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "... dette er lokasjonen til den første definisjonen" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "minst to filer må angis" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -742,7 +734,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -771,7 +763,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -820,7 +812,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -855,11 +847,11 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "ingen innfil angitt" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "trenger nøyaktig to innfiler" @@ -887,17 +879,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "mangler argumenter" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -907,14 +899,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -923,43 +915,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "mangler argumenter" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "minst to filer må angis" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -969,7 +961,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1005,84 +997,84 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d oversatt melding" msgstr[1] "%d oversatte meldinger" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d antatt oversettelse" msgstr[1] ", %d antatte oversettelser" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d uoversatt melding" msgstr[1] ", %d uoversatte meldinger" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1091,7 +1083,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1100,7 +1092,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1109,7 +1101,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1121,7 +1113,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1131,7 +1123,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1147,7 +1139,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1155,7 +1147,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1165,211 +1157,219 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "ulovlig kontrollsekvens" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "denne meldingen er brukt, men ikke definert i %s" msgstr[1] "denne meldingen er brukt, men ikke definert i %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "denne meldingen er brukt, men ikke definert i %s" msgstr[1] "denne meldingen er brukt, men ikke definert i %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "filhodefelt «%s» mangler i filhode" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "noen filhodefelt har fremdeles sin initielle verdi" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "feltet «%s» har fremdeles sin forvalgte verdi" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n" "%*s advarsel: tegnsettkonvertering vil ikke virke" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "Tegnsettet mangler i headeren.\n" "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n" "%*s advarsel: tegnsettkonvertering vil ikke virke" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domenenavnet «%s» passer ikke som filnavn" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "nøkkelord «domain %s» ignorert" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "duplisert definisjon av melding" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "... dette er lokasjonen til den første definisjonen" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "tom «msgstr»-linje ignorert" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "antatt «msgstr»-linje ignorert" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: advarselL: kildefil har antatte oversettelser" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1400,7 +1400,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1435,18 +1435,18 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1454,19 +1454,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1475,7 +1475,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1484,7 +1484,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1495,39 +1495,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1539,52 +1539,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 #, fuzzy msgid "warning: " msgstr "%s: advarsel: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1593,7 +1593,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1602,12 +1602,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1615,7 +1615,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1624,7 +1624,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1632,15 +1632,15 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1649,7 +1649,7 @@ msgstr "" "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n" "og iconv() støtter ikke \"%s\".\n" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1658,11 +1658,11 @@ msgstr "" "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n" "Denne versjonen ble blygget uten iconv().\n" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1687,7 +1687,7 @@ msgstr "" "resultater. Resultatet blir skrevet til standard ut, med mindre en utfil\n" "er spesifisert.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1698,7 +1698,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1706,7 +1706,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1723,7 +1723,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1733,17 +1733,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "denne meldingen er brukt, men ikke definert i %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "denne meldingen er brukt, men ikke definert i %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1752,11 +1752,11 @@ msgstr "" "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, " "foreldete %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " ferdig.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og %s utelukker hverandre" @@ -1872,19 +1872,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1906,7 +1906,7 @@ msgstr "" " MSGID MSGID-PLURAL oversett MSGID (entall) / MSGID-PLURAL (flertall)\n" " COUNT velg entalls-/flertallsform basert på denne verdien\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1922,17 +1922,17 @@ msgstr "" "miljøvariabelen TEXTDOMAINDIR.\n" "Standard søkekatalog er: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: advarsel: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -1941,15 +1941,15 @@ msgstr "" "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n" "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Fortsetter likevel, forvent parsefeil." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Fortsetter likevel." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -1958,7 +1958,7 @@ msgstr "" "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n" "og iconv() støtter ikke \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -1966,12 +1966,12 @@ msgstr "" "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n" "vil rette dette problemet.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -1980,7 +1980,7 @@ msgstr "" "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n" "Denne versjonen ble blygget uten iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2013,134 +2013,134 @@ msgid "plural form has wrong index" msgstr "flertallsform har feil indeks" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "for mange feil, avbryter" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "ulovlig multibytesekvens" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "ulovlig multibytesekvens" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "ulovlig multibytesekvens" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "feil under lesing av «%s»" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "nøkkelord «%s» ukjent" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ulovlig kontrollsekvens" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "slutt-på-fil inne i streng" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "slutt-på-linje inne i streng" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "filen «%s» er avkuttet" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "filen «%s» inneholder en ikke-NUL-terminert streng" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "filen «%s» er ikke i GNU .mo-format" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "filen «%s» inneholder en ikke-NUL-terminert streng" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "for mange argumenter" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "feil under skriving av filen «%s»" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "kan ikke opprette utfilen «%s»" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "feil under skriving av filen «%s»" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "feil under åpning av «%s» for skriving" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2149,72 +2149,72 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikke opprette utfilen «%s»" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard ut" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: advarsel: uavsluttet tegnkonstant" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: advarsel: uavsluttet strengliteral" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "denne filen kan ikke inneholde domene-direktiver" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan ikke brukes når utdata blir skrevet til standard ut" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext kan ikke arbeide uten å finne nøkkelord" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2224,19 +2224,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2246,7 +2255,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2257,7 +2266,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2297,22 +2306,33 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard inn" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "språket «%s» er ukjent" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "filen «%s» inneholder en ikke-NUL-terminert streng" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "«seek» «%s» posisjon %ld mislyktes" diff --git a/po/pl.gmo b/po/pl.gmo index 9845d0310..bca0d4fac 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 14b759dc1..2eed384e5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.39\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-08-01 23:50+0200\n" "Last-Translator: Rafa³ Maszkowski \n" "Language-Team: Polish \n" @@ -16,231 +16,231 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "b³±d w czasie otwierania \"%s\" do czytania" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "b³±d otwarcia \"%s\" do pisania" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "b³±d w czasie czytania \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "b³±d podczas pisania do pliku \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "b³±d w czasie czytania \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Nieznany b³±d systemu" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcja: `%s' jest niejednoznaczna\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcja `%s' wymaga argumentu\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nierozpoznana opcja `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nierozpoznana opcja `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: niedozwolona opcja -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: b³êdna opcja -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcja wymaga argumentu -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcja `-W %s' jest niejednoznaczna\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "pamiêæ wyczerpana" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -252,45 +252,45 @@ msgstr "" "Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji MO¯LIWO¦CI\n" "SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Zapisane przez %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "za du¿o argumentów" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "brakuj±ce argumenty" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -312,7 +312,7 @@ msgstr "" " [TEXTDOMAIN] MSGID wydob±d¼ z TEXTDOMAIN przet³umaczony komunikat\n" " odpowiadaj±cy MSGID\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -334,26 +334,26 @@ msgstr "" "wybranym katalogu.\n" "Domy¶lnie przeszukiwany katalog: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -363,9 +363,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -373,47 +373,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s i %s wzajemnie siê wykluczaj±" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -422,8 +422,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -432,7 +432,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -444,7 +444,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -456,7 +456,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -491,12 +491,12 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -529,7 +529,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -539,7 +539,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -613,7 +613,7 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -621,20 +621,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "nie podano nazw plików wej¶ciowych" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -657,7 +657,7 @@ msgstr "" "komunikaty w programie zosta³y przet³umaczone. Tam gdzie nie mo¿na\n" "porównaæ dok³adnie u¿ywane jest porównanie rozmyte, dla lepszej diagnostyki.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -666,31 +666,31 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ale ta definicja jest podobna" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "uwaga: ten komunikat nie jest u¿yty" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -698,19 +698,11 @@ msgstr[0] "znaleziono %d b msgstr[1] "znaleziono %d b³êdy krytyczne" msgstr[2] "znaleziono %d b³êdów krytycznych" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "podwójna definicja komunikatu" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...to jest po³o¿enie pierwszej definicji" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "musz± byæ podane przynajmniej dwa pliki" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -737,7 +729,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -764,7 +756,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -813,7 +805,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -848,11 +840,11 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "nie podano nazwy pliku wej¶ciowego" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe" @@ -880,17 +872,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "brakuj±ce argumenty" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -900,14 +892,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -916,43 +908,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "brakuj±ce argumenty" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "musz± byæ podane przynajmniej dwa pliki" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -962,7 +954,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -998,53 +990,53 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1052,7 +1044,7 @@ msgstr[0] "%d przet msgstr[1] "%d przet³umaczone komunikaty" msgstr[2] "%d przet³umaczonych komunikatów" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1060,7 +1052,7 @@ msgstr[0] ", %d t msgstr[1] ", %d t³umaczenia budz± w±tpliwo¶ci" msgstr[2] ", %d t³umaczeñ budzi w±tpliwo¶ci" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1068,17 +1060,17 @@ msgstr[0] ", %d nie przet msgstr[1] ", %d nie przet³umaczone komunikaty" msgstr[2] ", %d nie przet³umaczonych komunikatów" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1087,7 +1079,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1096,7 +1088,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1105,7 +1097,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1117,7 +1109,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1127,7 +1119,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1143,7 +1135,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1151,7 +1143,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1161,56 +1153,56 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "b³êdna sekwencja steruj±ca" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1218,7 +1210,7 @@ msgstr[0] "ten komunikat jest u msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1226,148 +1218,156 @@ msgstr[0] "ten komunikat jest u msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "linie `msgid' i `msgid_plural' nie zaczynaj± siê obie od '\\n'`" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "linie `msgid' i `msgstr[%u]' nie zaczynaj± siê obie od '\\n'`" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "linie `msgid' i `msgstr' nie zaczynaj± siê obie od '\\n'`" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "linie `msgid' i `msgid_plural' nie koñcz± siê obie na '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "linie `msgid' i `msgstr[%u]' nie koñcz± siê obie na '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "linie `msgid' i `msgstr' nie koñcz± siê obie na '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "w nag³ówku brakuje pola `%s'" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "pole nag³ówka `%s' powinno siê zaczynaæ na pocz±tku linii" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n" "%*s uwaga: konwersja kodowania nie bêdzie dzia³aæ" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "W nag³ówku brakuje nazwy kodowania.\n" "Przekodowanie na kodowanie u¿ytkownika nie bêdzie dzia³aæ.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n" "%*s uwaga: konwersja kodowania nie bêdzie dzia³aæ" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "nazwa domeny \"%s\" nie jest odpowiedni± nazwa pliku" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u¿yjê przedrostka" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "dyrektywa `domena %s' zignorowana" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "podwójna definicja komunikatu" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...to jest po³o¿enie pierwszej definicji" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "zignorowana pusta warto¶æ `msgstr'" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "zignorowana niepewna (fuzzy) warto¶æ `msgstr'" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1398,7 +1398,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1433,18 +1433,18 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1452,19 +1452,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1473,7 +1473,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1482,7 +1482,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1493,39 +1493,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1537,52 +1537,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 #, fuzzy msgid "warning: " msgstr "%s: ostrze¿enie: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1591,7 +1591,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1600,12 +1600,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1613,7 +1613,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1622,7 +1622,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1630,15 +1630,15 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1647,7 +1647,7 @@ msgstr "" "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n" "a iconv() nie obs³uguje \"%s\".\n" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, fuzzy, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1656,11 +1656,11 @@ msgstr "" "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n" "Ta wersja zosta³a skompilowana bez iconv().\n" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1684,7 +1684,7 @@ msgstr "" "dok³adnie u¿ywane jest porównanie rozmyte, dla lepszych wyników. Wyniki s±\n" "pisane na standardowe wyj¶cie je¿eli plik wyj¶iowy nie jest podany.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1695,7 +1695,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1703,7 +1703,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1720,7 +1720,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1730,17 +1730,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1749,11 +1749,11 @@ msgstr "" "%sPrzeczytane %ld starych + %ld odno¶ników, %ld do³±czonych, %ld " "niedok³adnych, %ld brakuj±cych, %ld przestarza³ych.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " zrobione.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s i %s wzajemnie siê wykluczaj±" @@ -1869,19 +1869,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1904,7 +1904,7 @@ msgstr "" " MSGID MSGID-MNOGI przet³umaczenie MSGID (pojed.) / MSGID-MNOGI (mn.)\n" " LICZBA wybranie formy pojed./mn. w oparciu o LICZBÊ\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1920,17 +1920,17 @@ msgstr "" "podana przez zmienn± ¶rodowiskow± TEXTDOMAINDIR.\n" "Domy¶lnie przeszukiwany katalog: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: ostrze¿enie: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -1939,15 +1939,15 @@ msgstr "" "Kodowanie \"%s\" nie ma przeno¶nej nazwy.\n" "Przekodowanie na zestaw znaków u¿ytkownika mo¿e nie dzia³aæ\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Kontynuacja mimo wszystko, mo¿na oczekiwaæ b³êdów analizy sk³adni." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Kontynuacja mimo wszystko." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -1956,7 +1956,7 @@ msgstr "" "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n" "a iconv() nie obs³uguje \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -1964,12 +1964,12 @@ msgstr "" "Problem mo¿na rozwi±zaæ instaluj±c libiconv GNU i instaluj±c\n" "ponownie gettext GNU.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -1978,7 +1978,7 @@ msgstr "" "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n" "Ta wersja zosta³a skompilowana bez iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2011,135 +2011,135 @@ msgid "plural form has wrong index" msgstr "forma mnoga ma z³y indeks" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "%s: za du¿o b³êdów, przerwanie wykonywania" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "b³êdna sekwencja wielobajtowa" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "b³êdna sekwencja wielobajtowa" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "b³êdna sekwencja wielobajtowa" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "b³±d w czasie czytania \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "nieznane s³owo kluczowe \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "b³êdna sekwencja steruj±ca" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "znak koñca pliku wewn±trz ³añcucha" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "znak koñca wiersza wewn±trz ³añcucha" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "obciêty plik \"%s\"" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "" "plik \"%s\" zawiera ³añcuch znaków, który nie jest zakoñczony znakiem NUL" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "plik \"%s\" nie jest w formacie .mo GNU" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" "plik \"%s\" zawiera ³añcuch znaków, który nie jest zakoñczony znakiem NUL" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "za du¿o argumentów" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "b³±d podczas pisania do pliku \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "b³±d podczas pisania do pliku \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "b³±d otwarcia \"%s\" do pisania" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2148,71 +2148,71 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standardowe wyj¶cie" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing nie mo¿e byæ u¿yte kiedy wyniki" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext nie mo¿e dzia³aæ bez podania s³ów kluczowych" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "uwaga: typ pliku `%s' z rozszerzeniem `%s' jest nieznany; spróbujê C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2222,19 +2222,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2244,7 +2253,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2255,7 +2264,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2295,22 +2304,34 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "wej¶cie standardowe" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "nieznany jêzyk `%s'" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "" +#~ "plik \"%s\" zawiera ³añcuch znaków, który nie jest zakoñczony znakiem NUL" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "nieudane przej¶cie do pozycji w \"%s\", ofset %ld" diff --git a/po/pt.gmo b/po/pt.gmo index 1e3489f2b..126776f4c 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 80ed63c30..fa935ac96 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.23\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 1996-09-18 20:51 WET DST\n" "Last-Translator: Nuno Oliveira \n" "Language-Team: Portuguese \n" @@ -13,232 +13,232 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro durante a abertura de \"%s\" para leitura" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "erro durante a abertura de \"%s\" para escrita" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "erro durante a leitura de \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "erro durante a escrita do ficheiro \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "erro durante a leitura de \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Erro desconhecido do sistema" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opção `%s' é ambígua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opção `--%s' não permite um argumento\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opção `%c%s' não permite um argumento\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: a opção `%s' requere um argumento\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção não reconhecida `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção não reconhecida `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opção requere um argumento -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, fuzzy, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opção `%s' é ambígua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, fuzzy, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opção `--%s' não permite um argumento\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 #, fuzzy msgid "memory exhausted" msgstr "memória exausta" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "impossível criar o ficheiro de saída \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "o número de especificações em `msgid' e `msgstr' é diferente" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "as especificações do argumento %u são diferentes" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "as especificações do argumento %u são diferentes" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "o número de especificações em `msgid' e `msgstr' é diferente" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "o número de especificações em `msgid' e `msgstr' é diferente" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "o número de especificações em `msgid' e `msgstr' é diferente" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "as especificações do argumento %u são diferentes" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "as especificações do argumento %u são diferentes" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -246,45 +246,45 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "demasiados argumentos" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argumentos insuficientes" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, fuzzy, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para mais informação\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -306,7 +306,7 @@ msgstr "" " [DIALECTO] MSGID obtém a mensagem traduzida correspondente a\n" " MSGID do DIALECTO\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -329,25 +329,25 @@ msgstr "" "são traduzidas.\n" "Directório standard de pesquisa: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -357,9 +357,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -367,47 +367,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s são mutuamente exclusivas" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -416,8 +416,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -426,7 +426,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -438,7 +438,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -450,7 +450,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -484,12 +484,12 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -508,7 +508,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -518,7 +518,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -577,7 +577,7 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -585,20 +585,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ficheiros de entrada não fornecidos" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "são necessários exactamente 2 ficheiros" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -625,7 +625,7 @@ msgstr "" "é usado um emparelhamento aproximado para produzir melhores\n" "diagnósticos.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -634,49 +634,41 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "esta mensagem é usada mas não definida..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...mas esta definição é semelhante" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "atenção: esta mensagem não é usada" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, fuzzy, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "encontrados %d erros fatais" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definição de mensagem duplicada" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...este é o local da primeira definição" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -689,7 +681,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -702,7 +694,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -750,7 +742,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -784,11 +776,11 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "nenhum ficheiro de entrada fornecido" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "são necessários exactamente 2 ficheiros" @@ -816,17 +808,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "argumentos insuficientes" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -836,14 +828,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -852,42 +844,42 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "argumentos insuficientes" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -897,7 +889,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -932,81 +924,81 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, fuzzy, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d mensagens traduzidas" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, fuzzy, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d traduções aproximadas" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, fuzzy, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d mensagens não traduzidas" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1015,7 +1007,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1024,7 +1016,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1033,7 +1025,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1045,7 +1037,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1055,7 +1047,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1071,7 +1063,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1079,7 +1071,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1089,212 +1081,220 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "sequência de controlo ilegal" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "esta mensagem é usada mas não definida em %s" msgstr[1] "esta mensagem é usada mas não definida em %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "esta mensagem é usada mas não definida em %s" msgstr[1] "esta mensagem é usada mas não definida em %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 #, fuzzy msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 #, fuzzy msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, fuzzy, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 #, fuzzy msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "o campo `%s' falta no cabeçalho" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "o campo `%s' do cabeçalho deve começar no início da linha" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "o campo `%s' ainda tem o valor por defeito inicial" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "nome de domínio \"%s\" não apropriado como nome de ficheiro:\n" "prefixo usado" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "directiva `domínio %s' ignorada" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definição de mensagem duplicada" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...este é o local da primeira definição" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "elemento `msgstr' vazio ignorada" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 #, fuzzy msgid "fuzzy `msgstr' entry ignored" msgstr "elemento `msgstr' vazio ignorada" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, fuzzy, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1325,7 +1325,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1359,18 +1359,18 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1378,19 +1378,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1399,7 +1399,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1408,7 +1408,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1419,39 +1419,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1463,51 +1463,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1516,7 +1516,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1525,12 +1525,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1538,7 +1538,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1547,7 +1547,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1555,33 +1555,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1608,7 +1608,7 @@ msgstr "" "resultados serão escritos no canal de saída por defeito (stdout) a\n" "menos que seja especificado um ficheiro de saída.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1619,7 +1619,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1627,7 +1627,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1644,7 +1644,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1654,17 +1654,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1673,11 +1673,11 @@ msgstr "" "%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %" "d, obsoletas %d.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr "terminado.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s são mutuamente exclusivas" @@ -1796,19 +1796,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1830,7 +1830,7 @@ msgstr "" " [DIALECTO] MSGID obtém a mensagem traduzida correspondente a\n" " MSGID do DIALECTO\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1850,57 +1850,57 @@ msgstr "" "são traduzidas.\n" "Directório standard de pesquisa: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, fuzzy, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" "Message conversion to user's charset might not work.\n" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 #, fuzzy msgid "" "Charset missing in header.\n" @@ -1934,129 +1934,129 @@ msgid "plural form has wrong index" msgstr "" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "demasiados erros, interrompendo" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 #, fuzzy msgid "invalid multibyte sequence" msgstr "sequência de controlo ilegal" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "sequência de controlo ilegal" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "sequência de controlo ilegal" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "erro durante a leitura de \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "palavra chave \"%s\" desconhecida" -#: src/po-lex.c:935 +#: src/po-lex.c:856 #, fuzzy msgid "invalid control sequence" msgstr "sequência de controlo ilegal" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "fim-de-ficheiro dentro da cadeia" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "fim-de-linha dentro da cadeia" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "ficheiro \"%s\"truncado" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, fuzzy, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "o ficheiro \"%s\" não está no formato .mo GNU" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "o ficheiro \"%s\" não está no formato .mo GNU" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "o ficheiro \"%s\" não está no formato .mo GNU" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "demasiados argumentos" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "erro durante a escrita do ficheiro \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "impossível criar o ficheiro de saída \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "erro durante a escrita do ficheiro \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "erro durante a abertura de \"%s\" para escrita" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2064,7 +2064,7 @@ msgstr "" "as mensagens de internacionalização não devem conter\n" "a sequência de escape `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2073,75 +2073,75 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "impossível criar o ficheiro de saída \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "canal de saída por defeito (stdout)" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "este ficheiro não pode conter directivas de domínio" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing não pode ser usada quando a saída\n" "é escrita no stdout" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, fuzzy, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n" "será tentado C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2151,19 +2151,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2173,7 +2182,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2184,7 +2193,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2223,22 +2232,33 @@ msgstr "" " -V, --version mostra a informação de versão e sai\n" " -w, --width=NÚMERO especifica a largura de página na saída\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrada standard" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "o ficheiro \"%s\" não está no formato .mo GNU" + #, fuzzy #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "seek \"%s\" offset %ld falhou" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 3211c4d44..4b72cca3a 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 272bf29cb..8c01cce84 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.36\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2001-04-03 08:25+02:00\n" "Last-Translator: Flávio Bruno Leitner \n" "Language-Team: Brazilian Portuguese \n" @@ -16,197 +16,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro ao abrir \"%s\" para leitura" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, fuzzy, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "erro ao abrir o arquivo \"%s\" para gravação" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, fuzzy, c-format msgid "error reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, fuzzy, c-format msgid "error writing \"%s\"" msgstr "erro ao gravar o arquivo \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, fuzzy, c-format msgid "error after reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opção `%s' é ambígua\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opção `--%s' não aceita parâmetros\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opção `%c%s' não aceita parâmetros\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opção `%s' requer um argumento\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção não reconhecida `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção não reconhecida `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opção ilegal -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opção inválida -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opção requer um argumento -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opção `-W %s' é ambígua\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opção `-W %s' não aceita parâmetros\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "Memória insuficiente" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 #, fuzzy msgid "cannot create pipe" msgstr "não foi possível criar o arquivo de saída \"%s\"" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, fuzzy, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "" "número de especificações de formatos em `msgid' e `msgstr' não conferem" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, fuzzy, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, fuzzy, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-java.c:660 +#: src/format-java.c:632 #, fuzzy, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-java.c:675 +#: src/format-java.c:647 #, fuzzy, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-java.c:700 +#: src/format-java.c:672 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, fuzzy, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "" "número de especificações de formatos em `msgid' e `msgstr' não conferem" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, fuzzy, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-python.c:397 +#: src/format-python.c:375 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -214,7 +214,7 @@ msgid "" msgstr "" "número de especificações de formatos em `msgid' e `msgstr' não conferem" -#: src/format-python.c:409 +#: src/format-python.c:387 #, fuzzy, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -222,29 +222,29 @@ msgid "" msgstr "" "número de especificações de formatos em `msgid' e `msgstr' não conferem" -#: src/format-python.c:437 +#: src/format-python.c:415 #, fuzzy, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-python.c:452 +#: src/format-python.c:430 #, fuzzy, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/format-python.c:478 +#: src/format-python.c:456 #, fuzzy, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "especificações de formato para o argumento %lu são diferentes" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,45 +255,45 @@ msgstr "" "Este é um sofware livre; veja os fontes para condições de cópia. Não existe\n" "garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "excesso de parâmetros" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "parâmetros não informados" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para maiores informações\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "" -#: src/gettext.c:255 +#: src/gettext.c:251 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -315,7 +315,7 @@ msgstr "" " [DOMÍNIO] MSGID recupera mensagens traduzidas correspondentes\n" " para MSGID no DOMÍNIO\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -337,26 +337,26 @@ msgstr "" "mensagens encontradas no catálogo selecionado\n" "Diretório de pesquisa padrão: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 #, fuzzy msgid "Report bugs to .\n" msgstr "Reporte bugs para .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -366,9 +366,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -376,47 +376,47 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s são mutuamente exclusivos" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -425,8 +425,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -435,7 +435,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -447,7 +447,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -459,7 +459,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -491,12 +491,12 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "critério de seleção especificado impossível (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" @@ -531,7 +531,7 @@ msgstr "" "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n" "os arquivos PO serão preservados.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -541,7 +541,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -614,7 +614,7 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -622,20 +622,20 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "arquivos de entrada não informados" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "são necessários 2 arquivos de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, fuzzy, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -660,7 +660,7 @@ msgstr "" "mensagens do programa foram traduzidas. Onde uma igualdade não puder ser\n" "encontrada uma aproximação é utilizada para produzir um melhor diagnóstico.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -669,50 +669,42 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "esta mensagem é utilizada, mas não foi definida..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...mas esta definição é similar" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensagem é utilizada mas não definida em %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "atenção: esta mensagem não é utilizada" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "encontrado %d erro fatal" msgstr[1] "encontrados %d erros fatais" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "definição duplicada de mensagem" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...esta é a localização da primeira definição" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "pelo menos dois arquivos devem ser especificados" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -741,7 +733,7 @@ msgstr "" "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n" "os arquivos PO serão preservados.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -770,7 +762,7 @@ msgstr "" "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n" "os arquivos PO serão preservados.\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -816,7 +808,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -848,11 +840,11 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "não foi informado o arquivo de entrada" -#: src/msgen.c:197 +#: src/msgen.c:198 #, fuzzy msgid "exactly one input file required" msgstr "são necessários 2 arquivos de entrada" @@ -880,17 +872,17 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:180 +#: src/msgexec.c:174 #, fuzzy msgid "missing command name" msgstr "parâmetros não informados" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -900,14 +892,14 @@ msgid "" "across all invocations.\n" msgstr "" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -916,43 +908,43 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 #, fuzzy msgid "missing filter name" msgstr "parâmetros não informados" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 #, fuzzy msgid "at least one sed script must be specified" msgstr "pelo menos dois arquivos devem ser especificados" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" "and writes a modified translation to standard output.\n" msgstr "" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -962,7 +954,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -995,84 +987,84 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d mensagem traduzida" msgstr[1] "%d mensagens traduzidas" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d tradução aproximada (fuzzy)" msgstr[1] ", %d traduções aproximadas (fuzzy)" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d mensagem não traduzida" msgstr[1] ", %d mensagens não traduzidas" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1081,7 +1073,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1090,7 +1082,7 @@ msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1099,7 +1091,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1111,7 +1103,7 @@ msgid "" "written under the specified directory.\n" msgstr "" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1121,7 +1113,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1137,7 +1129,7 @@ msgid "" " -f, --use-fuzzy use fuzzy entries in output\n" msgstr "" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1145,7 +1137,7 @@ msgid "" " --no-hash binary file will not include the hash table\n" msgstr "" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1155,213 +1147,221 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 #, fuzzy msgid "invalid nplurals value" msgstr "seqüência de controle ilegal" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, fuzzy, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "esta mensagem é utilizada mas não definida em %s" msgstr[1] "esta mensagem é utilizada mas não definida em %s" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, fuzzy, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "esta mensagem é utilizada mas não definida em %s" msgstr[1] "esta mensagem é utilizada mas não definida em %s" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid' e `msgstr' não começam com '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' e `msgstr' não começam com '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' e `msgstr' não terminam com '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' e `msgstr' não terminam com '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, fuzzy, c-format msgid "headerfield `%s' missing in header\n" msgstr "campo `%s' faltando no cabeçalho" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, fuzzy, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "campo `%s' deve iniciar no começo da linha" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 #, fuzzy msgid "some header fields still have the initial default value\n" msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, fuzzy, c-format msgid "field `%s' still has initial default value\n" msgstr "campo `%s' ainda possui o valor inicial" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 #, fuzzy msgid "warning: PO file header missing or invalid\n" msgstr "" "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n" "%*s aviso: conversão de charset não vai funcionar" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 #, fuzzy msgid "warning: charset conversion will not work\n" msgstr "" "%s: aviso: falta o cabeçalho relativo ao charset\n" "%*s aviso: conversão de charset não vai funcionar" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 #, fuzzy msgid "warning: PO file header fuzzy\n" msgstr "" "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n" "%*s aviso: conversão de charset não vai funcionar" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "nome do domínio \"%s\" não é válido como nome de arquivo" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um " "prefixo" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domain %s': diretiva ignorada" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "definição duplicada de mensagem" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...esta é a localização da primeira definição" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "`msgstr' vazia: mensagem ignorada" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: aviso: arquivo fonte contém traduções aproximadas" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1392,7 +1392,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1424,18 +1424,18 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" "file. This is necessary so you can test your translations.\n" msgstr "" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1443,19 +1443,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1464,7 +1464,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1473,7 +1473,7 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1484,39 +1484,39 @@ msgid "" " the output page width, into several lines\n" msgstr "" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1528,51 +1528,51 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, fuzzy, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, fuzzy, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1581,7 +1581,7 @@ msgid "" "To select a different output encoding, use the --to-code option.\n" msgstr "" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1590,12 +1590,12 @@ msgid "" "Possible workarounds are:\n" msgstr "" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1603,7 +1603,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1612,7 +1612,7 @@ msgid "" " then convert back to %s using 'msgconv'.\n" msgstr "" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1620,33 +1620,33 @@ msgid "" "A possible workaround is to set LC_ALL=C.\n" msgstr "" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " "not support this conversion." msgstr "" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " "built without iconv()." msgstr "" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1671,7 +1671,7 @@ msgstr "" "Os resultados serão gravados na saída padrão, a menos que um arquivo de\n" "saída seja especificado.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1682,7 +1682,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1690,7 +1690,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1707,7 +1707,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1717,17 +1717,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensagem é utilizada mas não definida em %s" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensagem é utilizada mas não definida em %s" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1736,11 +1736,11 @@ msgstr "" "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, " "perdidas %ld, obsoletas %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " feito.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s são mutuamente exclusivos" @@ -1857,19 +1857,19 @@ msgid "" " -u, --unique print only unique messages, discard duplicates\n" msgstr "" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, fuzzy, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -1891,7 +1891,7 @@ msgstr "" " [DOMÍNIO] MSGID recupera mensagens traduzidas correspondentes\n" " para MSGID no DOMÍNIO\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, fuzzy, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -1910,17 +1910,17 @@ msgstr "" "mensagens encontradas no catálogo selecionado\n" "Diretório de pesquisa padrão: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, fuzzy, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -1929,40 +1929,40 @@ msgstr "" "%s: aviso: charset \"%s\" não é um encoding portável\n" "%*s aviso: conversão de charset pode não funcionar" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" "and iconv() does not support \"%s\".\n" msgstr "" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" "This version was built without iconv().\n" msgstr "" -#: src/po-charset.c:338 +#: src/po-charset.c:337 #, fuzzy msgid "" "Charset missing in header.\n" @@ -1996,134 +1996,134 @@ msgid "plural form has wrong index" msgstr "forma plural tem o índice errado" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "excesso de erros - finalizando" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "sequência multibyte inválido" -#: src/po-lex.c:543 +#: src/po-lex.c:481 #, fuzzy msgid "incomplete multibyte sequence at end of file" msgstr "sequência multibyte inválido" -#: src/po-lex.c:553 +#: src/po-lex.c:491 #, fuzzy msgid "incomplete multibyte sequence at end of line" msgstr "sequência multibyte inválido" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "palavra chave \"%s\" desconhecida" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "seqüência de controle ilegal" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "fim de arquivo sem string" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "fim de linha sem string" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "arquivo \"%s\" truncado" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "arquivo \"%s\" contém string não terminada em NULL" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "arquivo \"%s\" não está no formato GNU .mo" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "arquivo \"%s\" contém string não terminada em NULL" -#: src/urlget.c:150 +#: src/urlget.c:143 #, fuzzy msgid "expected two arguments" msgstr "excesso de parâmetros" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" "the locally accessible FILE is used instead.\n" msgstr "" -#: src/urlget.c:222 +#: src/urlget.c:213 #, fuzzy msgid "error writing stdout" msgstr "erro ao gravar o arquivo \"%s\"" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, fuzzy, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "não foi possível criar o arquivo de saída \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "erro ao gravar o arquivo \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "erro ao abrir o arquivo \"%s\" para gravação" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2132,72 +2132,72 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "não foi possível criar o arquivo de saída \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "saída padrão" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: aviso: caractere constante indeterminado" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: aviso: string literal indeterminada" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "este arquivo parece não conter diretivas de domínio" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing não pode ser usado enquanto a saída é escrita na saída padrão" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext não pode funcionar sem as teclas para procurar" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2207,19 +2207,28 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:576 +#: src/xgettext.c:632 #, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2229,7 +2238,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2240,7 +2249,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2277,22 +2286,33 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "entrada padrão" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" msgstr "" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "idioma `%s' desconhecido" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "arquivo \"%s\" contém string não terminada em NULL" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "falha na pesquisa \"%s\" offset %ld" diff --git a/po/ru.gmo b/po/ru.gmo index dc36e1695..baf26c6bb 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index de42c8cec..28d675935 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-08 08:13+0400\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" @@ -15,235 +15,235 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ `%s'" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "ÎÅÏÄÎÏÚÎÁÞÎÙÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ `%s'" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "äÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÒÅÚÅÒ×ÎÏÇÏ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "ÏÛÉÂËÁ ÐÏÓÌÅ ÞÔÅÎÉÑ \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "îÅ ÎÁÊÄÅÎ ËÏÍÐÉÌÑÔÏÒ Java, ÐÏÓÔÁ×ØÔÅ gcj ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ Java, ÐÏÓÔÁ×ØÔÅ gij ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ " "$JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÎÁÌ" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÐÏÌÕÞÉÌ ÆÁÔÁÌØÎÙÊ ÓÉÇÎÁÌ %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `%s'" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "× `msgid' É `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' ËÁË × '%s'" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u × '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' × 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ËÁË × '%s'" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u} ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u}" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × `msgid' É `%s' ÎÅ ÜË×É×ÁÌÅÎÔÎÙ" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s' ÎÅ Ñ×ÌÑÀÔÓÑ ÐÏÄÍÎÏÖÅÓÔ×ÏÍ ÓÐÅÃÉÆÉËÁÃÉÊ ÉÚ " "'msgid' " -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " "tuple" msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ÏÔÏÂÒÁÖÅÎÉÅ, Á × '%s' -- ËÏÒÔÅÖ" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " "mapping" msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ËÏÒÔÅÖ, Á × '%s' -- ÏÔÏÂÒÁÖÅÎÉÅ" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s', ËÁË × '%s'" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %s" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,33 +255,33 @@ msgstr "" "× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n" "ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -290,12 +290,12 @@ msgstr "" "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [[äïíåî] MSGID]\n" " ÉÌÉ: %s [ëìàþ] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "ïÔÏÂÒÁÖÁÅÔ ÐÅÒÅ×ÏÄ ÔÅËÓÔÏÇÏ ÓÏÏÂÝÅÎÉÑ.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -317,7 +317,7 @@ msgstr "" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " [TEXTDOMAIN] MSGID ÎÁÊÔÉ ÐÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÑ MSGID × TEXTDOMAIN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -338,25 +338,25 @@ msgstr "" "×Ù×ÏÄÑÔÓÑ ÉÈ ÐÅÒÅ×ÏÄÙ ÉÚ ÕËÁÚÁÎÎÏÇÏ ÄÏÍÅÎÁ.\n" "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "ðÅÞÁÔÁÅÔ ÉÍÑ ÄÁÎÎÏÊ ÍÁÛÉÎÙ.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -371,9 +371,9 @@ msgstr "" " ÄÏÍÅÎÎÏÅ ÉÍÑ É ÐÓÅ×ÄÏÎÉÍÙ\n" " -i, --ip-address ÁÄÒÅÓÁ ÄÌÑ ÚÁÄÁÎÎÏÇÏ ÉÍÅÎÉ\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -384,32 +384,32 @@ msgstr "" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ÍÁÛÉÎÙ" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "ÐÒÉÎÉÍÁÅÔÓÑ ÎÅ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -418,15 +418,15 @@ msgstr "" "æÉÌØÔÒÕÅÔ ÓÏÏÂÝÅÎÉÑ ËÁÔÁÌÏÇÁ ÐÅÒÅ×ÏÄÏ× × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÉÈ ÁÔÒÉÂÕÔÁÍÉ\n" "É ÍÁÎÉÐÕÌÉÒÕÅÔ ÜÔÉÍÉ ÁÔÒÉÂÕÔÁÍÉ.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -439,8 +439,8 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -453,7 +453,7 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -472,7 +472,7 @@ msgstr "" " --no-obsolete ÕÄÁÌÉÔØ ÓÔÁÒÙÅ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ '#~'\n" " --only-obsolete ÓÏÈÒÁÎÉÔØ ÓÔÁÒÙÅ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ '#~'\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -491,7 +491,7 @@ msgstr "" " --fuzzy ÓÉÎÏÎÉÍ ÄÌÑ --only-fuzzy --clear-fuzzy\n" " --obsolete ÓÉÎÏÎÉÍ ÄÌÑ --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -524,12 +524,12 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]...\n" @@ -558,7 +558,7 @@ msgstr "" "ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ. ëÏÍÍÅÎÔÁÒÉÉ, ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ\n" "ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -573,7 +573,7 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -646,7 +646,7 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -657,20 +657,20 @@ msgstr "" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "ÎÅ ÚÁÄÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -688,7 +688,7 @@ msgstr "" "äÌÑ ÕÌÕÞÛÅÎÉÑ ÄÉÁÇÎÏÓÔÉËÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ\n" "ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ ÓÏ×ÐÁÄÅÎÉÅ.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -701,7 +701,7 @@ msgstr "" " ref.pot ÓÓÙÌËÉ ÎÁ ÉÓÈÏÄÎÉËÉ\n" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -710,24 +710,24 @@ msgstr "" "íÏÄÉÆÉËÁÔÏÒÙ:\n" " -m, --multi-domain ÐÒÉÍÅÎÉÔØ ref.pot ËÏ ×ÓÅÍ ÄÏÍÅÎÁÍ ÉÚ def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏÇÒÁÍÍÏÊ, ÎÏ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ÏÄÎÁËÏ ÚÄÅÓØ ÏÐÒÅÄÅÌÅÎÏ ÐÏÈÏÖÅÅ ÓÏÏÂÝÅÎÉÅ" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -735,19 +735,11 @@ msgstr[0] " msgstr[1] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÅ ÏÛÉÂËÉ" msgstr[2] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÈ ÏÛÉÂÏË" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÎÅ ÍÅÎÅÅ Ä×ÕÈ ÆÁÊÌÏ×" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -767,7 +759,7 @@ msgstr "" "ÔÏÌØËÏ ÉÚ ÐÅÒ×ÏÇÏ PO-ÆÁÊÌÁ, × ËÏÔÏÒÏÍ ÏÎÉ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ. ëÏÍÍÅÎÔÁÒÉÉ,\n" "ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -788,7 +780,7 @@ msgstr "" " -u, --unique ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --less-than=2, ÚÁÐÒÁÛÉ×ÁÅÔ\n" " ÐÅÞÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÈ ÓÏÏÂÝÅÎÉÊ\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -840,7 +832,7 @@ msgstr "" " -t, --to-code=éíñ ×ÙÈÏÄÎÁÑ ËÏÄÉÒÏ×ËÁ\n" "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÄÉÒÏ×ËÁ ÔÅËÕÝÅÊ ÌÏËÁÌÉ.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -873,11 +865,11 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "ÎÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÒÏ×ÎÏ ÏÄÉÎ ×ÈÏÄÎÏÊ ÆÁÊÌ" @@ -912,16 +904,16 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "ÎÅ ÚÁÄÁÎÁ ËÏÍÁÎÄÁ" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ëïíáîäá [ëìàþ-ëïíáîäù]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -936,7 +928,7 @@ msgstr "" "×Ù×ÏÄ ÏÔÐÒÁ×ÌÑÅÔÓÑ ÎÁ ×ÙÈÏÄ msgexec. úÎÁÞÅÎÉÅ, ×ÏÚ×ÒÁÝÁÅÍÏÅ msgexec --\n" "ÜÔÏ ÍÁËÓÉÍÁÌØÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÓÒÅÄÉ ×ÓÅÈ ×ÙÚÏ×Ï×.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -945,7 +937,7 @@ msgstr "" "óÐÅÃÉÁÌØÎÁÑ ×ÓÔÒÏÅÎÎÁÑ ËÏÍÁÎÄÁ '0' ×Ù×ÏÄÉÔ ÐÅÒÅ×ÏÄ É ÚÁ ÎÉÍ ÎÕÌÅ×ÏÊ\n" "ÂÁÊÔ. ÷Ù×ÏÄ \"msgexec 0\" ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÅÒÅÄÁÞÉ ÎÁ ×ÈÏÄ \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -958,34 +950,34 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "ÚÁÐÉÓØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅÕÓÐÅÛÎÁ" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "ÚÁÐÉÓØ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÆÉÌØÔÒÁ" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÓÃÅÎÁÒÉÊ sed" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] æéìøôò [ëìàþ-æéìøôòá]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "ðÒÉÍÅÎÑÅÔ ÆÉÌØÔÒ ËÏ ×ÓÅÍ ÐÅÒÅ×ÏÄÁÍ ËÁÔÁÌÏÇÁ.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -994,7 +986,7 @@ msgstr "" "æÉÌØÔÒ ÍÏÖÅÔ ÂÙÔØ ÌÀÂÏÊ ÐÒÏÇÒÁÍÍÏÊ, ÞÉÔÁÀÝÅÊ ÐÅÒÅ×ÏÄ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ É\n" "ÐÅÞÁÔÁÀÝÅÊ ÉÚÍÅÎÅÎÎÙÊ ÐÅÒÅ×ÏÄ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1009,7 +1001,7 @@ msgstr "" " ×ÙÐÏÌÎÑÅÍÙÍ ËÏÍÁÎÄÁÍ\n" " -n, --quiet, --silent ×ÙËÌÀÞÉÔØ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÅÞÁÔØ ÏÂÒÁÚÃÁ\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1044,54 +1036,54 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "ÎÅ×ÏÚÍÏÖÎÏ ÏÒÇÁÎÉÚÏ×ÁÔØ ÎÅÂÌÏËÉÒÕÀÝÉÊ ××ÏÄ/×Ù×ÏÄ ÄÌÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "ÐÏÐÙÔËÁ Ó×ÑÚÉ Ó ÄÏÞÅÒÎÉÍ ÐÒÏÃÅÓÓÏÍ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "ÞÔÅÎÉÅ ÏÔ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÄÉÎÏÞÎÙÍ ÐÕÎËÔÕÁÃÉÏÎÎÙÍ ÚÎÁËÏÍ" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-d ËÁÔÁÌÏÇ\"" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-l ÌÏËÁÌØ\"" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s ÉÌÉ %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1099,7 +1091,7 @@ msgstr[0] "%d msgstr[1] "%d ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÑ" msgstr[2] "%d ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1107,7 +1099,7 @@ msgstr[0] ", %d msgstr[1] ", %d ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÁ" msgstr[2] ", %d ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÏ×" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1115,17 +1107,17 @@ msgstr[0] ", %d msgstr[1] ", %d ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÑ" msgstr[2] ", %d ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ÉÍÑ-ÆÁÊÌÁ.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "óÏÚÄÁÅÔ Ä×ÏÉÞÎÙÊ ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÉÚ ÔÅËÓÔÏ×ÏÇÏ ÏÐÉÓÁÎÉÑ ÐÅÒÅ×ÏÄÏ×.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1138,7 +1130,7 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1151,7 +1143,7 @@ msgstr "" " --java2 ËÁË --java, ÎÏ ÐÒÅÄÐÏÌÁÇÁÅÔ Java2 (JDK 1.2 ÉÌÉ ×ÙÛÅ)\n" " --tcl ÒÅÖÉÍ Tcl: ÓÏÚÄÁÅÔ .msg-ÆÁÊÌ ÄÌÑ tcl/msgcat\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1164,7 +1156,7 @@ msgstr "" " --strict ×ËÌÀÞÉÔØ ÒÅÖÉÍ ÓÔÒÏÇÏÇÏ ÓÏÏÔ×ÅÔÓÔ×ÉÑ Uniforum\n" "åÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÐÅÞÁÔÁÅÔ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1183,7 +1175,7 @@ msgstr "" "ÚÎÁËÁ ÐÏÄÞÅÒËÉ×ÁÎÉÑ. ëÌÀÞ -d ÏÂÑÚÁÔÅÌÅÎ. ëÌÁÓÓ ÚÁÐÉÓÙ×ÁÅÔÓÑ × ÕËÁÚÁÎÎÙÊ\n" "ËÁÔÁÌÏÇ.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1197,7 +1189,7 @@ msgstr "" " -d ëáôáìïç ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ× ËÌÁÓÓÏ×\n" "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ. .msg-ÆÁÊÌ ÚÁÐÉÓÙ×ÁÅÔÓÑ × ÕËÁÚÁÎÎÙÊ ËÁÔÁÌÏÇ.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1225,7 +1217,7 @@ msgstr "" " ÄÌÑ ÐÕÎËÔÏ× ÍÅÎÀ\n" " -f, --use-fuzzy ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ ×Ù×ÏÄÅ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1236,7 +1228,7 @@ msgstr "" " -a, --alignment=þéóìï ×ÙÒÁ×ÎÉ×ÁÔØ ÓÔÒÏËÉ ÐÏ þéóìõ ÂÁÊÔ (ÐÏ ÕÍÏÌÞÁÎÉÀ: %d)\n" " --no-hash Ä×ÏÉÞÎÙÊ ÆÁÊÌ ÎÅ ÂÕÄÅÔ ×ËÌÀÞÁÔØ ÈÜÛ-ÔÁÂÌÉÃÕ\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1251,26 +1243,26 @@ msgstr "" " --statistics ÎÁÐÅÞÁÔÁÔØ ÓÔÁÔÉÓÔÉËÕ Ï ÐÅÒÅ×ÏÄÁÈ\n" " -v, --verbose Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ ÓÏÏÂÝÅÎÉÊ\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÏÔÒÉÃÁÔÅÌØÎÙÅ ÚÎÁÞÅÎÉÑ" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu, ÎÏ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÄÏ " "%lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁÔØ ÐÅÒÅÐÏÌÎÉÅ ÃÅÌÏÇÏ" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1278,32 +1270,32 @@ msgstr "" "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÉÓËÌÀÞÉÔÅÌØÎÙÅ ÓÉÔÕÁÃÉÉ × " "ÁÒÉÆÍÅÔÉËÅ, ×ÏÚÍÏÖÎÏ, ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"plural=÷ùòáöåîéå\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"nplurals=ãåìïå\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "ÎÅ×ÅÒÎÁÑ ÚÎÁÞÅÎÉÅ nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1313,7 +1305,7 @@ msgstr[1] "" "...ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" msgstr[2] " ...ÎÏ ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1321,12 +1313,12 @@ msgstr[0] "... msgstr[1] "...ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" msgstr[2] " ...ÎÏ ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "ðÏÐÒÏÂÕÊÔÅ ÓÌÅÄÕÀÝÅÅ, ÐÏÄÈÏÄÉÔ ÄÌÑ %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1334,134 +1326,142 @@ msgstr "" "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ × ÎÅÍ " "ÚÁÇÏÌÏ×ËÁ Ó \"Plural-Forms: nplurals=ãåìïå; plural=÷ùòáöåîéå;\"" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË " "ÄÒÕÇÏÅ -- ÎÅÔ" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ " "-- ÎÅÔ" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- " "ÎÅÔ" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ " "-- ÎÅÔ" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ " "-- ÎÅÔ" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "" "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- ÎÅÔ" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "ÏÂÒÁÂÏÔËÁ ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÉÅÍ GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s × ÏÔÌÉÞÉÅ ÏÔ 'msgid'" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "× msgstr ÎÅÄÏÓÔÁÅÔ ÏÔÍÅÔËÉ ËÌÁ×ÉÁÔÕÒÎÏÇÏ ÜË×É×ÁÌÅÎÔÁ '%c'" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "× msgstr ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÔÍÅÔÏË ËÌÁ×ÉÁÔÕÒÎÙÈ ÜË×É×ÁÌÅÎÔÏ× '%c'" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "× ÚÁÇÏÌÏ×ËÅ ÐÒÏÐÕÝÅÎÏ ÐÏÌÅ `%s'\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÎÏ×ÏÊ ÓÔÒÏËÉ\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" "ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÏÔÓÕÔÓÔ×ÕÅÔ ÉÌÉ ÎÅÐÒÁ×ÉÌÅÎ\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÄÉÒÏ×ÏË ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÐÏÍÅÞÅÎ ËÁË ÎÅÔÏÞÎÙÊ\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÂÏÌÅÅ ÓÔÁÒÙÅ ×ÅÒÓÉÉ msgfmt ×ÙÄÁÄÕÔ ÚÄÅÓØ ÏÛÉÂËÕ\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅÄÏÐÕÓÔÉÍÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÏ\n" "ÞÁÓÔÉÞÎÏ ÕÓÅÞÅÎÎÏÅ ÉÍÑ ÄÏÍÅÎÁ" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "ÄÉÒÅËÔÉ×Á `domain %s' ÉÇÎÏÒÉÒÏ×ÁÎÁ" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "ÐÕÓÔÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ÎÅÔÏÞÎÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "ËÌÀÞ '%c' ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÏ ÔÏÇÏ, ËÁË ÚÁÄÁÎÙ 'K' ÉÌÉ 'T'" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1471,7 +1471,7 @@ msgstr "" "ÚÁÄÁÎÎÏÍÕ ÏÂÒÁÚÃÕ ÉÌÉ ÐÒÉÎÁÄÌÅÖÁÔ ÚÁÄÁÎÎÙÍ ÉÓÈÏÄÎÙÍ ÆÁÊÌÁÍ.\n" "\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1532,7 +1532,7 @@ msgstr "" " -f, --file=æáêì ÐÏÌÕÞÉÔØ ïâòáúåã ÉÚ æáêìá\n" " -i, --ignore-case ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË×\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1565,11 +1565,11 @@ msgstr "" " --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "ÚÁÐÉÓØ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ grep ÎÅÕÓÐÅÛÎÁ" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1579,7 +1579,7 @@ msgstr "" "ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ ÓÒÅÄÙ LANG ËÁË ÏÐÉÓÁÎÏ × ÆÁÊÌÅ ABOUT-NLS. üÔÏ\n" "ÎÅÏÂÈÏÄÉÍÏ, ÞÔÏÂÙ ×Ù ÍÏÇÌÉ ÐÒÏ×ÅÒÉÔØ Ó×ÏÉ ÐÅÒÅ×ÏÄÙ.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1590,12 +1590,12 @@ msgstr "" "ðÏÖÁÊÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÌÏËÁÌØ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --locale ÉÌÉ ×ÙÈÏÄÎÏÊ\n" "po-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "óÏÚÄÁÎÏ %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1604,7 +1604,7 @@ msgstr "" "óÏÚÄÁÅÔ ÎÏ×ÙÊ PO-ÆÁÊÌ, ÉÎÉÃÉÁÌÉÚÉÒÕÑ ÍÅÔÁÉÎÆÏÒÍÁÃÉÀ ÉÓÈÏÄÑ ÉÚ\n" "ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÒÅÄÙ.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1617,7 +1617,7 @@ msgstr "" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ, ÏÎ ÉÝÅÔÓÑ × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ.\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1631,7 +1631,7 @@ msgstr "" "ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÌÏËÁÌÉ. åÓÌÉ ÏÎ ÚÁÄÁÎ ËÁË -, ÒÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ\n" "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1647,7 +1647,7 @@ msgstr "" " -w, --width=þéóìï ÚÁÄÁÅÔ ÛÉÒÉÎÕ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n" " --no-wrap ÎÅ ÒÁÚÂÉ×ÁÔØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1655,11 +1655,11 @@ msgstr "" "îÁÊÄÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ pot-ÆÁÊÌÁ.\n" "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "ÏÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÔÅËÕÝÅÇÏ ËÁÔÁÌÏÇÁ" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1667,23 +1667,23 @@ msgstr "" "÷ ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ ÎÅ ÎÁÊÄÅÎ pot-ÆÁÊÌ.\n" "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "×ÙÚÏ× fdopen() ÎÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÄÏÞÅÒÎÅÍ ÐÒÏÃÅÓÓÅ %s" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1699,28 +1699,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "ÔÅËÕÝÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ Ä×Å ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ \"%s\" É \"%s\"" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1729,17 +1729,17 @@ msgstr "" "ÄÏÍÅÎ \"%s\" ×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ " "ËÏÄÉÒÏ×ËÉ" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "ÃÅÌÅ×ÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1747,7 +1747,7 @@ msgstr "" "÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ ×\n" "UTF-8. ÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1760,7 +1760,7 @@ msgstr "" "÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8. þÔÏÂÙ ×ÙÂÒÁÔØ ÄÒÕÇÕÀ ×ÙÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ,\n" "ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ --to-code.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1772,12 +1772,12 @@ msgstr "" "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n" "÷ÏÚÍÏÖÎÙÅ ÍÅÔÏÄÙ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- õÓÔÁÎÏ×ÉÔØ LC_ALL ÒÁ×ÎÏÊ ÌÏËÁÌÉ Ó ËÏÄÉÒÏ×ËÏÊ %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1788,7 +1788,7 @@ msgstr "" " ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n" " ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1801,7 +1801,7 @@ msgstr "" " ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n" " ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1812,15 +1812,15 @@ msgstr "" "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n" "÷ÏÚÍÏÖÎÙÊ ÍÅÔÏÄ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ -- ÕÓÔÁÎÏ×ÉÔØ LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÎÅÕÓÐÅÛÎÏ" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1829,7 +1829,7 @@ msgstr "" "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\". %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ " "iconv() ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1838,11 +1838,11 @@ msgstr "" "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\". %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(). üÔÁ " "×ÅÒÓÉÑ ÂÙÌÁ ÓÏÂÒÁÎÁ ÂÅÚ iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "ÔÉÐ ÒÅÚÅÒ×ÎÏÇÏ ËÏÐÉÒÏ×ÁÎÉÑ" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1867,7 +1867,7 @@ msgstr "" "ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ\n" "ÓÏ×ÐÁÄÅÎÉÅ.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1884,7 +1884,7 @@ msgstr "" " -C, --compendium=æáêì ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÂÉÂÌÉÏÔÅËÁ ÐÅÒÅ×ÏÄÏ× ÓÏÏÂÝÅÎÉÊ, \n" " ÍÏÖÎÏ ÕËÁÚÙ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1895,7 +1895,7 @@ msgstr "" " -U, --update ÏÂÎÏ×ÉÔØ def.po,\n" " ÎÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ, ÅÓÌÉ def.po ÕÖÅ ÏÂÎÏ×ÌÅÎ\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1926,7 +1926,7 @@ msgstr "" "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1941,15 +1941,15 @@ msgstr "" " -v, --verbose Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ ÓÏÏÂÝÅÎÉÊ\n" " -q, --quiet, --silent ÎÅ ×Ù×ÏÄÉÔØ ÉÎÄÉËÁÔÏÒ ÐÒÏÇÒÅÓÓÁ\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1958,11 +1958,11 @@ msgstr "" "%sðÒÏÞÉÔÁÎÏ ÓÏÏÂÝÅÎÉÊ: ÓÔÁÒÙÈ %ld + ÎÏ×ÙÈ %ld; ÏÂßÅÄÉÎÅÎÏ %ld, ÐÏÍÅÞÅÎÏ " "ÎÅÔÏÞÎÙÍÉ %ld, ÎÅÄÏÓÔÁÀÝÉÈ %ld, ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÙÈ %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " ÚÁ×ÅÒÛÅÎÏ.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s É Ñ×ÎÏ ÚÁÄÁÎÎÏÅ ÉÍÑ ÆÁÊÌÁ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ" @@ -2115,12 +2115,12 @@ msgstr "" " -d, --repeated ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÄÕÂÌÉÒÏ×ÁÎÎÙÅ\n" " -u, --unique ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÅ, ÐÒÏÐÕÓËÁÑ ÄÕÂÌÉËÁÔÙ\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [äïíåî] MSGID MSGID-PLURAL þéóìï\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2129,7 +2129,7 @@ msgstr "" "ïÔÏÂÒÁÖÁÅÔ ÐÅÒÅ×ÏÄ ÔÅËÓÔÏ×ÏÇÏ ÓÏÏÂÝÅÎÉÑ, ÇÒÁÍÍÁÔÉÞÅÓËÁÑ ÆÏÒÍÁ ËÏÔÏÒÏÇÏ\n" "ÚÁ×ÉÓÉÔ ÏÔ ÞÉÓÌÁ.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2152,7 +2152,7 @@ msgstr "" " MSGID MSGID-PLURAL ÐÅÒÅ×ÅÓÔÉ MSGID (ÅÄ. ÞÉÓÌÏ) / MSGID-PLURAL (ÍÎ. ÞÉÓÌÏ)\n" " þéóìï ×ÙÂÒÁÔØ ÅÄ./ÍÎ. ÞÉÓÌÏ ÎÁ ÏÓÎÏ×Å ÜÔÏÇÏ ÚÎÁÞÅÎÉÑ\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2167,17 +2167,17 @@ msgstr "" "ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ TEXTDOMAINDIR.\n" "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2186,15 +2186,15 @@ msgstr "" "\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÎÁÚ×ÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ.\n" "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÍÏÖÅÔ ÎÅ ÓÒÁÂÏÔÁÔØ.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ, ÂÕÄÕÔ ÏÛÉÂËÉ ÒÁÚÂÏÒÁ." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2203,7 +2203,7 @@ msgstr "" "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ iconv() ÎÅ " "ÐÏÄÄÅÒÖÉ×ÁÅÔ \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2211,12 +2211,12 @@ msgstr "" "þÔÏÂÙ ÒÅÛÉÔØ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÕÓÔÁÎÏ×ÉÔÅ GNU libiconv É ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ GNU " "gettext.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2225,7 +2225,7 @@ msgstr "" "ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().\n" "üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2258,79 +2258,79 @@ msgid "plural form has wrong index" msgstr "ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÎÄÅËÓ" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÓÔÒÏËÉ" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "×ÙÚÏ× iconv ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ÎÅ×ÅÒÎÁÑ ÕÐÒÁ×ÌÑÀÝÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÓÔÒÏËÉ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "ÆÁÊÌ \"%s\" ÕÓÅÞÅÎ" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÓÔÒÏËÕ, ÎÅ ÚÁ×ÅÒÛÅÎÎÕÀ ÎÕÌÅÍ" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "ÆÁÊÌ \"%s\" ÎÅ × ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÆÏÒÍÁÔÕ GNU .mo" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÓÔÒÏËÕ, ÎÅ ÚÁ×ÅÒÛÅÎÎÕÀ ÎÕÌÅÍ, × ÐÏÚÉÃÉÉ %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "ÏÖÉÄÁÅÔÓÑ Ä×Á ÁÒÇÕÍÅÎÔÁ" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] URL æáêì\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2339,53 +2339,53 @@ msgstr "" "ðÏÌÕÞÁÅÔ É ×Ù×ÏÄÉÔ ÓÏÄÅÒÖÉÍÏÅ ÚÁÄÁÎÎÏÇÏ URL. åÓÌÉ Ë URL ÎÅ×ÏÚÍÏÖÎÏ\n" "ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ, ×ÍÅÓÔÏ ÎÅÇÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÕËÁÚÁÎÎÙÊ ÌÏËÁÌØÎÙÊ æáêì.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ, ÐÏÐÒÏÂÕÊÔÅ ÕÓÔÁÎÏ×ÉÔØ $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ Ó ÐÏÍÏÝØÀ ÛÁÂÌÏÎÁ \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÉÍÅÎÅÍ ËÌÁÓÓÁ Java" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÎÉÑ \"%s\" ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "ËÏÍÐÉÌÑÃÉÑ Java-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose ÉÌÉ " "ÕÓÔÁÎÏ×ÉÔÅ $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2398,67 +2398,67 @@ msgstr "" "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù. ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgid ÞÉÓÔÏÊ ASCII.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÉÍ×ÏÌØÎÁÑ ËÏÎÓÔÁÎÔÁ" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ" # ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÔÒÏËÉ" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: ÐÒÏÐÕÝÅÎÏ ÞÉÓÌÏ ÐÏÓÌÅ #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÓÔÒÏËÏ×ÏÅ ×ÙÒÁÖÅÎÉÅ" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "ËÌÀÞ --join-existing ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÚÁÐÉÓÉ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "éÚ×ÌÅËÁÅÔ ÐÅÒÅ×ÏÄÉÍÙÅ ÓÔÒÏËÉ ÉÚ ÕËÁÚÁÎÎÙÈ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2467,7 +2467,7 @@ msgstr "" "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" "ôÏ ÖÅ É ÄÌÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2483,14 +2483,14 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2501,7 +2501,16 @@ msgstr "" " -C, --c++ ÓÉÎÏÎÉÍ --language=C++\n" "ðÏ ÕÍÏÌÞÁÎÉÀ ÑÚÙË ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÒÁÓÛÉÒÅÎÉÀ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2517,7 +2526,7 @@ msgstr "" " ôåçïí (ÉÌÉ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÍÉ\n" " ËÌÀÞÅ×ÏÊ ÓÔÒÏËÅ)\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2536,7 +2545,7 @@ msgstr "" " --debug ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÒÅÚÕÌØÔÁÔ ÒÁÚÂÏÒÁ ÆÏÒÍÁÔÎÏÊ\n" " ÓÔÒÏËÉ\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2582,11 +2591,18 @@ msgstr "" " -M, --msgstr-suffix[=óôòïëá]\n" " ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÓÕÆÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ msgstr\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2596,7 +2612,7 @@ msgstr "" "gettext(\"\") ×ÏÚ×ÒÁÝÁÅÔ ÔÅËÓÔ ÚÁÇÏÌÏ×ËÁ Ó ÍÅÔÁÉÎÆÏÒÍÁÃÉÅÊ,\n" "Á ÎÅ ÐÕÓÔÕÀ ÓÔÒÏËÕ.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ" diff --git a/po/sk.gmo b/po/sk.gmo index e2bce471e..773611743 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index c148059ee..f0db39f49 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-17 22:10+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -15,197 +15,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "neplatný parameter \"%s\" pre \"%s\"" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "nejednoznaèný parameter \"%s\" pre \"%s\"" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Platné parametre sú:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "chyba pri otváraní súboru \"%s\" na èítanie" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "nemô¾em otvori» súbor \"%s\" na zápis" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "chyba pri èítaní \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "chyba pri zápise \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "chyba po èítaní \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Neznáma systémová chyba" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s podproces zlyhal" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: voµba `%s' nie je jednoznaèná\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: voµba `--%s' nepovoµuje parameter\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: voµba `%c%s' nepovoµuje parameter\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: voµba `%s' vy¾aduje parameter\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznáma voµba `--%s'\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznáma voµba `%c%s'\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neprípustná voµba -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neplatná voµba -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: voµba vy¾aduje parameter -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: voµba `-W %s' nie je jednoznaèná\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: voµba `-W %s' nedovoµuje pou¾itie parametra\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "Kompilátor Javy nebol nájdený. Skúste nain¹talova» gcj alebo nastavte $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Virtuálny stroj Javy nebol nájdený. Skúste nain¹talova» gij alebo nastavte " "$JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "pamä» je vyèerpaná" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "nemô¾em vytvori» rúru" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s podproces" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s podproces dostal kritický signál %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "poèet formátovacích znaèiek v 'msgid' a '%s' sa nezhoduje" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "formátovacie znaèky v 'msgid' a '%s' pre parameter %u nie sú rovnaké" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "formátovacia znaèka pre parameter %u v '%s' nie je v 'msgid'" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "formátovacia znaèka pre parameter %u nie je v '%s'" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "formátovacia znaèka pre parameter {%u} v '%s' nie je v 'msgid'" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "formátovacia znaèka pre parameter {%u} neexistuje v '%s'" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "formátovacie znaèky v 'msgid' a '%s' pre parameter {%u} nie sú rovnaké" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "formátovacie znaèky v 'msgid' a '%s' nie sú ekvivalentné" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formátovacie znaèky v '%s' nie sú podmno¾inou znaèiek z 'msgid'" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -214,7 +214,7 @@ msgstr "" "formátovacie znaèky v 'msgid' predpokladajú mapovanie, ale znaèky v '%s' " "predpokladajú tuple" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -223,29 +223,29 @@ msgstr "" "formátovacie znaèky v 'msgid' predpokladajú tuple, ale znaèky v '%s' " "predpokladajú mapovanie" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "formátovacia znaèka pre parameter '%s' v '%s' nie je v 'msgid'" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "formátovacia znaèka pre parameter '%s' nie je v '%s'" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "formátovacie znaèky v 'msgid' a '%s' pre parameter '%s' nie sú rovnaké" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -257,33 +257,33 @@ msgstr "" "Neposkytuje sa ®IADNA záruka; ani èo sa týka OBCHODOVATE¥NOSTI alebo VHODNOSTI\n" "NA KONKRÉTNY ÚÈEL.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Napísal %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "príli¹ veµa parametrov" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "chýbajúce parametre" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -292,12 +292,12 @@ msgstr "" "Pou¾itie: %s [VO¥BA] [[DOMÉNA] ID_SPRÁVY]\n" "alebo: %s [VO¥BA] -s [ID_SPRÁVY]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Zobrazi» preklad textovej správy do natívneho jazyka.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -319,7 +319,7 @@ msgstr "" " [DOMÉNA] ID_SPRÁVY vybra» prelo¾enú správu zodpovedajúcu ID_SPRÁVY\n" " z DOMÉNY\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -339,11 +339,11 @@ msgstr "" "ktoré sa nachádzajú vo vybranom katalógu správ budú prelo¾ené.\n" "©tandardný adresár, v ktorom sa budú hµada» katalógy: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" "Správy o chybách zasielajte na adresu (iba " @@ -351,17 +351,17 @@ msgstr "" "Komentáre k slovenskému prekladu zasielajte na adresu .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Pou¾itie: %s [VO¥BA]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Zobrazi» hostiteµské meno stroja.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -376,9 +376,9 @@ msgstr "" " doménového mena a prezývok\n" " -i, --ip-address adresy pre meno hostiteµa\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -389,32 +389,32 @@ msgstr "" " -h, --help zobrazi» túto nápovedu a skonèi»\n" " -V, --version zobrazi» informáciu o verzii a skonèi»\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "Nemô¾em získa» meno hostiteµa" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "povolený najviac jeden vstupný súbor" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s a %s sa navzájom vyluèujú" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -423,15 +423,15 @@ msgstr "" "Filtruje správy z prekladového katalógu podµa ich vlastností a mení tieto\n" "vlastnosti.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Povinné parametre pre dlhé voµby sú povinnými aj pre skrátené voµby.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -445,8 +445,8 @@ msgstr "" " vstupné súbory\n" "Ak nie je zadaný vstupný súbor alebo je -, naèítaný je ¹tandardný vstup.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -459,7 +459,7 @@ msgstr "" "Ak nie je zadaný výstupný súbor alebo je -, výsledky su zapísané\n" "na ¹tandardný výstup.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -478,7 +478,7 @@ msgstr "" " --no-obsolete odstráni» zastarané správy oznaèené #~\n" " --only-obsolete zachova» zastarané správy oznaèené #~\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -497,7 +497,7 @@ msgstr "" " --fuzzy synonymum pre --only-fuzzy --clear-fuzzy\n" " --obsolete synonymum pre --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -532,12 +532,12 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]...\n" @@ -565,7 +565,7 @@ msgstr "" "zabezpeèí ich zachovanie iba z prvého PO súboru, ktorý ich definuje.\n" "Pozície v zdrojových súboroch budú zlúèené zo v¹etkých PO súborov.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -581,7 +581,7 @@ msgstr "" " vstupné súbory\n" "Ak je vstupný súbor -, naèítaný je ¹tandardný vstup.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -656,7 +656,7 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -667,20 +667,20 @@ msgstr "" " -h, --help zobrazi» túto nápovedu a skonèi»\n" " -V, --version zobrazi» informáciu o verzii a skonèi»\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "neboli zadané vstupné súbory" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "potrebné sú presne 2 vstupné súbory" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Pou¾itie: %s [VO¥BA] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -697,7 +697,7 @@ msgstr "" "Keï nie je mo¾né nájs» presnú zhodu, je pou¾itý fuzzy algoritmus, ktorý\n" "umo¾òuje lep¹iu kontrolu zhody.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -711,7 +711,7 @@ msgstr "" " -D, --directory=ADRESÁR prida» ADRESÁR do zoznamu pre vyhµadávané\n" " vstupné súbory\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -720,24 +720,24 @@ msgstr "" "Modifikátory operácie:\n" " -m, --multi-domain opu¾ije ref.pot na v¹etky domény v def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "táto správa je pou¾itá, ale nie je definovaná..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ale táto definícia je podobná" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "táto správa je pou¾itá, ale nie je definovaná v %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "upozornenie: táto správa nie je pou¾itá" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -745,19 +745,11 @@ msgstr[0] "n msgstr[1] "nájdená %d záva¾ná chyba" msgstr[2] "nájdené %d záva¾né chyby" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "duplicitná definícia správy" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...toto je miesto prvého definovania" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "musia by» uvedené minimálne dva súbory" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -777,7 +769,7 @@ msgstr "" "komentáre budú zachované iba z prvého PO súboru, v ktorom sú definované.\n" "Pozície v zdrojových súboroch budú zlúèené zo v¹etkých PO súborov.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -798,7 +790,7 @@ msgstr "" " -u, --unique skratka pre --less-than=2, nastavuje výpis\n" " len unikátnych správ\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -851,7 +843,7 @@ msgstr "" " -t, --to-code=NÁZOV kódovanie výstupu\n" "Predvolené kódovanie je kódovanie aktuálneho národného prostreda.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -885,11 +877,11 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "nie sú zadané vstupné súbory" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "potrebné je presne jeden vstupný súbor" @@ -925,16 +917,16 @@ msgstr "" " vstupné súbory\n" "Ak je vstupný súbor -, naèítaný je ¹tandardný vstup.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "chýbajúci názov príkazu" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Pou¾itie: %s [VO¥BA] PRÍKAZ [VO¥BA-PRÍKAZU]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -949,7 +941,7 @@ msgstr "" "bude aj výstupom programu msgexec. Návratová hodnota programu msgexec je\n" "maximum návratových hodnôt v¹etkých spustení príkazu.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -958,7 +950,7 @@ msgstr "" "©peciálny vstavaný príkaz s názvom '0' vypisuje preklad nasledovaný nulovým\n" "bajtom. Výstup príkazu \"msgexec 0\" je pou¾iteµný ako vstup pre \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -972,34 +964,34 @@ msgstr "" " vstupných súborov\n" "Ak nie je zadaný vstupný súbor alebo je -, je naèítaný ¹tandardný vstup.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "zápis na ¹tandardný výstup zlyhal" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "zápis do podprocesu %s zlyhal" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "chýbajúci názov filtra" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "musí by» uvedený aspoò jeden sed skript" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Pou¾itie: %s [VO¥BA] FILTER [VO¥BA-FILTRA]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Aplikova» filter na v¹etky preklady prekladového katalógu.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1008,7 +1000,7 @@ msgstr "" "FILTER mô¾e by» µubovoµný program, ktorý èíta preklady zo ¹tandardného vstupu\n" "a zapisuje upravené preklady na ¹tandardný výstup.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1023,7 +1015,7 @@ msgstr "" " príkazom\n" " -n, --quiet, --silent potlaèi» automatickú tlaè priestoru vzorov\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1060,53 +1052,53 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "nemô¾em nastavi» neblokujúce V/V na podproces %s" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "komunikácia s podprocesom %s zlyhala" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "èítanie z podprocesu %s zlyhalo" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "podproces %s bol ukonèený s ukonèovacím kódom %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "parameter pre %s by malo by» len jedno interpunkèné znamienko" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s vy¾aduje ¹pecifikáciu \"-d adresár\"" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s vy¾aduje ¹pecifikáciu \"-l národné prostredie\"" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s je platné len s %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s je platné len s %s alebo %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1114,7 +1106,7 @@ msgstr[0] "%d prelo msgstr[1] "%d prelo¾ená správa" msgstr[2] "%d prelo¾ené správy" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1122,7 +1114,7 @@ msgstr[0] ", %d nepresn msgstr[1] ", %d nepresný preklad" msgstr[2] ", %d nepresné preklady" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1130,17 +1122,17 @@ msgstr[0] ", %d neprelo msgstr[1] ", %d neprelo¾ená správa" msgstr[2] ", %d neprelo¾ené správy" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Pou¾itie: %s [VO¥BA] menosúboru.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Generova» binárny katalóg správ z textového popisu prekladu.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1154,7 +1146,7 @@ msgstr "" " vstupných súborov\n" "Ak je vstupný súbor -, je naèítaný ¹tandardný vstup.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1168,7 +1160,7 @@ msgstr "" " vy¹¹ie)\n" " --tcl mód Tcl: generova» súbor .msg tcl/msgcat\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1181,7 +1173,7 @@ msgstr "" " --strict povoli» presne dodr¾aný mód Uniforum\n" "Ak je výstupný súbor -, výstup je zapísaný na ¹tandardný výstup.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1201,7 +1193,7 @@ msgstr "" "oddelené znakom \"_\". Voµba -d je povinná. Trieda je zapísaná do zadaného\n" "adresára.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1216,7 +1208,7 @@ msgstr "" " -d ADRESÁR základný adresár katalógov správ .msg\n" "Voµby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1244,7 +1236,7 @@ msgstr "" " pre polo¾ky menu\n" " -f, --use-fuzzy pou¾i» polo¾ky fuzzy vo výstupe\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1255,7 +1247,7 @@ msgstr "" " -a, --alignment=POÈET zarovna» re»azce na POÈET bajtov (¹tandardne: %d)\n" " --no-hash binárny súbor nebude obsahova» ha¹ovaciu tabuµku\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1270,26 +1262,26 @@ msgstr "" " --statistics zobrazi» ¹tatistiky prekladov\n" " -v, --verbose zvý¹i» úroveò táravosti\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "výraz pre mno¾né èíslo mô¾e nadobúda» záporné hodnoty" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu, ale výraz pre mno¾né èíslo mô¾e nadobúda» hodnoty väè¹ie ako " "%lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "výraz pre mno¾né èíslo mô¾e spôsobi» delenie nulou" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "výraz pre mno¾né èíslo mô¾e spôsobi» celoèíselné preteèenie" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1297,32 +1289,32 @@ msgstr "" "výraz pre mno¾né èíslo mô¾e spôsobi» aritmetickú výnimku, pravdepodobne " "delenie nulou" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "katalóg správ má preklady s mno¾nými èíslami..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...ale v hlavièke chýba \"plural=VÝRAZ\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...ale v hlavièke chýba \"nplurals=ÈÍSLO\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "neplatná hodnota nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "neplatný výraz pre mno¾né èíslo" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1330,7 +1322,7 @@ msgstr[0] "...ale niektor msgstr[1] "...ale niektoré správy majú len %lu tvar mno¾ného èísla" msgstr[2] "...ale niektoré správy majú len %lu tvary mno¾ných èísel" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1338,12 +1330,12 @@ msgstr[0] "...ale niektor msgstr[1] "...ale niektoré správy majú %lu tvar mno¾ného èísla" msgstr[2] "...ale niektoré správy majú %lu tvary mno¾ných èísel" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Skúste pou¾i» nasledujúce, platné pre %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1351,122 +1343,130 @@ msgstr "" "katalóg správ má preklady s mno¾nými èíslami, ale v hlavièke chýba \"Plural-" "Forms: nplurals=ÈÍSLO; plural=VÝRAZ;\"" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "polo¾ky `msgid' a `msgid_plural' nezaèínajú obe s '\\n'" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "polo¾ky `msgid' a `msgstr[%u]' nezaèínajú obe s '\\n'" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "polo¾ky `msgid' a `msgstr' nezaèínajú obe s '\\n'" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "polo¾ky `msgid' a `msgid_plural' nie sú obe ukonèené s '\\n'" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "polo¾ky `msgid' a `msgstr[%u]' nie sú obe ukonèené s '\\n'" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "polo¾ky `msgid' a `msgstr' nie sú obe ukonèené s '\\n'" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "spracovanie mno¾ných èísel je roz¹írením GNU" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s' nie je platný formátovací re»azec %s, na rozdiel od 'msgid'" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "v msgstr chýba znaèka klávesovej skratky '%c'" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr obsahuje príli¹ veµa znaèiek klávesových skratiek '%c'" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "hlavièková polo¾ka `%s' chýba v hlavièke\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "hlavièková polo¾ka `%s' má zaèína» na zaèiatku riadku\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "" "niektoré polo¾ky hlavièky e¹te obsahujú poèiatoèné ¹tandardné hodnoty\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "polo¾ka `%s' e¹te obsahuje poèiatoènú ¹tandardnú hodnotu\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "upozornenie: hlavièka súboru PO chýba alebo je neplatná\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "upozornenie: konverzia znakovej sady nebude fungova»\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "upozornenie: hlavièka súboru PO je nepresná\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "upozornenie: star¹ie verzie msgfmt vrátia pri tomto chybu\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "meno domény \"%s\" nie je pou¾itelné ako meno súboru" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "meno domény \"%s\" nie je pou¾itelné ako meno súboru: pou¾ije sa predpona" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "direktíva `domain %s' bola ignorovaná" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "duplicitná definícia správy" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...toto je miesto prvého definovania" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "prázdna polo¾ka `msgstr' bola ignorovaná" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "nepresná polo¾ka `msgstr' bola ignorovaná" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "voµba '%c' nemô¾e by» pou¾itá pred ¹pecifikovaným 'K' alebo 'T'" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1475,7 +1475,7 @@ msgstr "" "Vyberie v¹etky správy z prekladového katalógu, ktoré vyhovujú zadanému\n" "vzoru alebo sú v zadaných zdrojových súboroch.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1534,7 +1534,7 @@ msgstr "" " -f, --file=SÚBOR získa» VZOR zo SÚBORu\n" " -i, --ignore-case ignorova» rozlí¹enie veµkých a malých písmen\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1568,11 +1568,11 @@ msgstr "" " --sort-outout generova» utriedený výstup\n" " --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "zlyhal zápis do podprocesu grep" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1583,7 +1583,7 @@ msgstr "" "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestova»\n" "va¹e preklady.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1594,12 +1594,12 @@ msgstr "" "Zadajte, prosím, národné prostredie pomocou voµby --locale alebo\n" "výstupný .po súbor pomocou voµby --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Vytvorený %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1608,7 +1608,7 @@ msgstr "" "Vytvorí nový PO súbor, inicializuje meta informácie podµa hodnôt z prostredia\n" "pou¾ívateµa.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1621,7 +1621,7 @@ msgstr "" "Ak nie je zadaný vstupný súbor, bude vyhµadaný POT súbor v aktuálnom adresári.\n" "Ak je -, naèítaný je ¹tandardný vstup.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1635,7 +1635,7 @@ msgstr "" "nastavenia národného prostredia pou¾ívateµa. Ak je -, výstup je zapísaný na\n" "¹tandardný výstup.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1652,7 +1652,7 @@ msgstr "" " --no-wrap nezalamova» dlhé riadky sráv, dlh¹ie ako\n" " ¹írka výstupnej strany, do viacerých riadkov\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1660,11 +1660,11 @@ msgstr "" "Nájdených viac ako jeden .pot súbor.\n" "Prosím zadajte vstupný .pot súbor pomocou voµby --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "chyba pri èítaní adresára" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1672,23 +1672,23 @@ msgstr "" "V aktuálnom adresári nebol nájdený ¾iaden .pot súbor.\n" "Prosím zadajte vstupný .pot súbor pomocou voµby --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() zlyhalo" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "V/V chyba podprocesu %s" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "podproces %s zlyhal s ukonèovacím kódom %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1705,28 +1705,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Slovenské preklady pre balík %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "aktuálna znaková sada \"%s\" nie je prenositeµné meno kódovania" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "vstupný súbor \"%s\" nemá v hlavièke uvedenú znakovú sadu" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1734,17 +1734,17 @@ msgid "" msgstr "" "doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavièke uvedenú znakovú sadu" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "cieµová znaková sada \"%s\" nie je prenositeµné meno kódovania." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "upozornenie: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1753,7 +1753,7 @@ msgstr "" "UTF-8.\n" "Konvertujem výstup do UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1766,7 +1766,7 @@ msgstr "" "Konvertujem výstup do UTF-8.\n" "Iné výstupné kódovanie si mô¾ete zvoli» pomocou voµby --to-code.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1779,12 +1779,12 @@ msgstr "" "Výstup z '%s' mô¾e by» nesprávny.\n" "Mo¾né rie¹enia sú:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Nastavi» LC_ALL na národné prostredie s kódovaním %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1795,7 +1795,7 @@ msgstr "" " potom pou¾i» '%s',\n" " potom konvertova» spä» na %s pomocou 'msgconv'.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1808,7 +1808,7 @@ msgstr "" " potom pou¾i» '%s',\n" " potom konvertova» spä» na %s pomocou 'msgconv'.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1820,15 +1820,15 @@ msgstr "" "Výstup z '%s' mô¾e by» nesprávny.\n" "Mo¾nou obchádzkou je nastavenie LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "konverzia zlyhala" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "vstupný súbor nemá v hlavièke uvedenú znakovú sadu" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1837,7 +1837,7 @@ msgstr "" "Nemô¾em konvertova» z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() " "nepodporuje takúto konverziu." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1846,11 +1846,11 @@ msgstr "" "Nemô¾em konvertova» z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia " "bola prelo¾ená bez iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "typ zálohy" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1874,7 +1874,7 @@ msgstr "" "pri ktorých nie je mo¾né nájs» presnú zhodu, bude pou¾itý fuzzy algoritmus,\n" "ktorý dosahuje lep¹ie výsledky.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1892,7 +1892,7 @@ msgstr "" " -C, --compendium=SÚBOR prídavna kni¾nica prekladov správ, mô¾e by»\n" " zadaná viac ako raz\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1903,7 +1903,7 @@ msgstr "" " -U, --update aktualizova» def.po,\n" " nerobi» niè, ak def.po je aktuálny\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1932,7 +1932,7 @@ msgstr "" "Prípona zálohy je '~', pokiaµ nie je zadaná voµba --suffix alebo nastavená\n" "premenná prostredia SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1947,15 +1947,15 @@ msgstr "" " -v, --verbose zvý¹i» úroveò táravosti\n" " -q, --quiet, --silent potlaèi» indikátory postupu\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "táto správa by mala definova» tvary mno¾ného èísla" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "táto správa by nemala definova» tvary mno¾ného èísla" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1964,11 +1964,11 @@ msgstr "" "%sNaèítané %ld starých + %ld odkazov, %ld zluèených, %ld nepresných, %ld " "chýbajucich, %ld zru¹ených.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " hotovo.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s a explicitné mená súborov sa navzájom vyluèujú" @@ -2122,12 +2122,12 @@ msgstr "" " -d, --repeated zobrazi» len duplikáty\n" " -u, --unique zobrazi» len unikátne správy, potlaèi» duplikáty\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Pou¾itie: %s [VO¥BA] [DOMÉNA] ID_SPRÁVY ID_SPRÁVY-MNÈ POÈET\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2136,7 +2136,7 @@ msgstr "" "Zobrazi» preklad textovej správy, ktorej gramatický tvar závisí od èísla,\n" "do natívneho jazyka.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2159,7 +2159,7 @@ msgstr "" " (mno¾né èíslo)\n" " POÈET vybra» jednotné/mno¾né èíslo na základe tejto hodnoty\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2173,17 +2173,17 @@ msgstr "" "mô¾e by» urèené obsahom premennej prostredia TEXTDOMAINDIR.\n" "©tandardný adresár, v ktorom sa budú hµada» katalógy: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "<¹tandardný vstup>" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: upozornenie: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2192,15 +2192,15 @@ msgstr "" "Znaková sada \"%s\" nie je prenositeµné meno kódovania.\n" "Konverzia hlásení do znakovej sady pou¾ívateµa nemusí fungova».\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Pokraèovanie aj napriek tomu. Mo¾no sa vyskytnú chyby pri analýze." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Pokraèovanie aj napriek tomu." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2209,7 +2209,7 @@ msgstr "" "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv()\n" "a iconv() nepodporuje \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2217,12 +2217,12 @@ msgstr "" "In¹talácia GNU balíka libiconv a následná prein¹talácia\n" "balíka GNU gettext by mala tento problém odstráni».\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2231,7 +2231,7 @@ msgstr "" "Znaková sada \"%s\" nie je podporovaná. %s spolieha na iconv().\n" "Táto verzia bola prelo¾ená bez iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2264,79 +2264,79 @@ msgid "plural form has wrong index" msgstr "mno¾né èíslo má nesprávny index" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "vyskytlo sa príli¹ veµa chýb, ukonèuje sa program" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "neplatná viacznaková sekvencia" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "nekompletná viacznaková sekvencia na konci súboru" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "nekompletná viacznaková sekvencia na konci riadku" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv zlyhal" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "chyba pri èítaní súboru \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "neznáme kµúèové slovo \"%s\"" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "neplatná riadiaca sekvencia" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "koniec súboru uprostred re»azca" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "koniec riadku uprostred re»azca" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "súbor \"%s\" je skrátený" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "súbor \"%s\" obsahuje re»azce, ktoré nie sú ukonèené nulou" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "súbor \"%s\" nie je vo formáte GNU .mo" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "súbor \"%s\" obsahuje re»azec, ktorý nie je ukonèený nulou, na %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "oèakávané dva parametre" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Pou¾itie: %s [VO¥BA] URL SÚBOR\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2345,51 +2345,51 @@ msgstr "" "Stiahne a zobrazí obsah z URL. Ak URL nie je dostupné, pou¾ije sa SÚBOR\n" "z lokálneho disku.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "chyba pri zápise na ¹tandardný výstup" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "nemô¾em nájs» doèasný adresár, skúste nastavi» $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "nemô¾em vytvori» doèasný adresár so ¹ablónou \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "nie je platným názvom triedy Java: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "zlyhalo vytvorenie \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "chyba poèas zápisu do súboru \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "kompilácia triedy Java zlyhalo, prosím skúste --verbose alebo nastavte $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "chyba pri otváraní súboru \"%s\" na zápis" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "internacionalizované správy nesmú obsahova» riadiacu sekvenciu `\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2402,66 +2402,66 @@ msgstr "" "ako vy. Zvá¾te namiesto to pou¾itie msgid len s ASCII znakmi.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "nie je mo¾né vytvori» výstupný súbor \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "¹tandardný výstup" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: upozornenie: neukonèená znaková kon¹tanta" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: upozornenie: neukonèený znakový re»azec" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "tento súbor nesmie obsahova» direktívy pre doménu" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: neplatná definícia re»azca" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: chýbajúce èíslo za #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: neplatný výraz re»azca" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing nesmie by» pou¾ité ak je výstup posielaný na ¹tandardný " "výstup" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext nemô¾e pracova» bez kµúèových slov, ktoré má hµada»" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "upozornenie: súbor `%s' s príponou `%s' je neznámy; skúsim C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extrahova» prelo¾iteµné re»azce zo zadaných vstupných súborov.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2470,7 +2470,7 @@ msgstr "" "Povinné parametre dlhých volieb sú povinné aj pre krátke voµby.\n" "Podobne aj pre voliteµné parametre.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2485,14 +2485,14 @@ msgstr "" " -p, --output-dir=ADRESÁR výstupné súbory budú umiestnené v adresári ADRESÁR\n" "Ak je výstupný súbor -, výstup je zapísaný na ¹tandardný výstup.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2504,7 +2504,16 @@ msgstr "" " -C, --c++ skratka pre --language=C++\n" "©tandardne je jazyk odhadnutý podµa prípony vstupného súboru.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2520,7 +2529,7 @@ msgstr "" " (alebo tie, ktoré predchádzajú kµúèové riadky)\n" " do výstupného súboru\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2539,7 +2548,7 @@ msgstr "" " --debug detailnej¹ie výsledky rozoznávania formátovacích\n" " re»azcov\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2587,11 +2596,18 @@ msgstr "" " -M, --msgstr-suffix[=RE«AZEC] pou¾i» RE«AZEC alebo \"\" ako príponu pre\n" " polo¾ky msgstr\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "¹tandardný vstup" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2601,7 +2617,7 @@ msgstr "" "gettext(\"\") vráti hlavièku s meta informáciami\n" "a nie prázdny re»azec.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "jazyk `%s' je neznámy" diff --git a/po/sl.gmo b/po/sl.gmo index 5590f1bd9..9df27a5c6 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 9a7ecab5a..0930ac82a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-13 13:19+0200\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -17,196 +17,196 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "neveljaven argument %s za ,%s`" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "dvoumen argument %s za ,%s`" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Veljavni argumenti so:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "datoteke \"%s\" ni moè odpreti za branje" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "varnostnega izvoda \"%s\" ni mogoèe odpreti za pisanje" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "napaka pri branju \"%s\"" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "napaka pri pisanju na \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "napaka po branju \"%s\"" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Neznana sistemska napaka" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s podproces neuspe¹en" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: izbira ,%s` je dvoumna\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: izbira ,--%s` ne dovoljuje argumenta\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: izbira ,%c%s` ne dovoljuje argumenta\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: izbira ,%s` zahteva argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neprepoznana izbira ,--%s`\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neprepoznana izbira ,%c%s`\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: nedovoljena izbira -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neveljavna izbira -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: izbira zahteva argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: izbira ,-W %s` je dvoumna\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: izbira ,-W %s` ne dovoljuje argumenta\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA" # Morda ,,Zmanjkalo pomnilnika''? -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "zmanjkalo pomnilnika" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "cevovoda ni mogoèe ustvariti" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s podprocesov" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s podprocesov prejelo kritièni signal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "¹tevili formatnih doloèil v ,msgid` in ,%s` se ne ujemata" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "formatni doloèili v ,msgid` in ,%s` za argument %u nista enaki" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "v ,msgid` ni formatnega doloèila za argument %u, kot v ,%s`" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "v ,%2$s` ni formatnega doloèila za argument %1$u" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "v ,msgid` ni formatnega doloèila za argument {%u}, kot v ,%s`" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "v ,%2$s` ni formatnega doloèila za argument {%1$u}" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "formatni doloèili v ,msgid` in ,%s` za argument {%u} nista enaki" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "formatni doloèili v ,msgid` in ,%s` nista enakovredni" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formatna doloèila v ,%s` niso podmno¾ica tistih v ,msgid`" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -215,7 +215,7 @@ msgstr "" "formatno doloèilo v ,msgid` zahteva preslikavo, tisto v ,%s` pa prièakuje n-" "terèek" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -224,29 +224,29 @@ msgstr "" "formatno doloèilo v ,msgid` zahteva n-terèek, tisto v ,%s` pa prièakuje " "preslikavo" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "v ,msgid` ni formatnega doloèila za argument ,%s`, kot v ,%s`" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "v ,%2$s` ni formatnega doloèila za argument ,%1$s`" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "formatni doloèili v ,msgid` in ,%s` za argument ,%s` nista enaki" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -258,33 +258,33 @@ msgstr "" "raz¹irjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n" "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA RABO.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Avtor %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "preveè argumentov" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argumenti manjkajo" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poskusite ,%s --help` za izèrpnej¹a navodila\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -293,12 +293,12 @@ msgstr "" "Uporaba: %s [IZBIRA] [[DOMENA] MSGID]\n" "ali: %s [IZBIRA] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Prikaz prevoda tekstovnega sporoèila.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -318,7 +318,7 @@ msgstr "" " -V, --version razlièica programa\n" " [DOMENA] MSGID i¹èemo prevod gesla MSGID v podani tekstovni DOMENI\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -338,25 +338,25 @@ msgstr "" "kataloga sporoèil.\n" "Privzet imenik s katalogom sporoèil: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "Morebitne napake v programu sporoèite na .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Uporaba: %s [IZBIRA]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Izpis gostiteljskega imena raèunalnika.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -371,9 +371,9 @@ msgstr "" " internetim imenom in vzdevki\n" " -i, --ip-address internetni naslov za gostiteljsko ime\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -384,32 +384,32 @@ msgstr "" " -h, --help ta navodila\n" " -V, --version razlièica programa\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "gostiteljskega imena ni moè ugotoviti" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "dovoljena je najveè ena vhodna datoteka" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s in %s se med seboj izkljuèujeta" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -418,9 +418,9 @@ msgstr "" "Filtriranje sporoèil iz kataloga prevodov glede na njihova doloèila\n" "in rokovanje z njimi.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" @@ -428,7 +428,7 @@ msgstr "" "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n" "tudi za kratko obliko.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -441,8 +441,8 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -455,7 +455,7 @@ msgstr "" "Èe izhodna datoteka ni podana ali je enaka -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -474,7 +474,7 @@ msgstr "" " --no-obsolete brez zastarelih (#~) sporoèil\n" " --only-obsolete zgolj zastarela (#~) sporoèila\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -493,7 +493,7 @@ msgstr "" " --fuzzy isto kot --only-fuzzy --clear-fuzzy\n" " --obsolete isto kot --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -524,12 +524,12 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "doloèeni kriteriji izbire niso mogoèi (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n" @@ -556,7 +556,7 @@ msgstr "" "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n" "v datotekah iz vseh datotek PO se ohranijo.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -571,7 +571,7 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe je vhodna datoteka enaka -, se bere standardni vhod.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -640,7 +640,7 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -651,20 +651,20 @@ msgstr "" " -h, --help ta navodila\n" " -V, --version razlièica programa\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "vhodni datoteki nista podani" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "potrebni sta natanèno dve vhodni datoteki" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -681,7 +681,7 @@ msgstr "" "v programu. Kadar ne najdemo natanènega ujemanja msgid, zaradi bolj¹e\n" "diagnostike poskusimo z ohlapnim (fuzzy) algoritmom.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -694,7 +694,7 @@ msgstr "" " ref.pot sklici na vire\n" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -703,24 +703,24 @@ msgstr "" "Modifikatorji delovanja:\n" " -m, --multi-domain ref.po uporabimo na vseh domenah iz def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "to sporoèilo je uporabljeno, a ne definirano..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...a ta definicija je podobna" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "to sporoèilo je uporabljeno, a ne definirano v %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "opozorilo: to sporoèilo ni uporabljeno" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" @@ -729,19 +729,11 @@ msgstr[1] "%d kriti msgstr[2] "%d kritièni napaki" msgstr[3] "%d kritiène napake" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "podvojena definicija sporoèila" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...to je kraj prve definicije" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "podani morata biti vsaj dve datoteki" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -760,7 +752,7 @@ msgstr "" "pri izvlaèenju se ohranijo samo iz prve podane datoteke PO. Mesta v datotekah \n" "se ohranijo iz vseh datotek PO.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -780,7 +772,7 @@ msgstr "" " -u, --unique okraj¹ava za --less-than=2, izpi¹emo samo\n" " enolièno definirana sporoèila\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -829,7 +821,7 @@ msgstr "" " -t, --to-code=NABOR nabor znakov izhodne datoteke\n" "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -860,11 +852,11 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "vhodna datoteka ni podana" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "zahtevana je natanèno ena vhodna datoteka" @@ -899,16 +891,16 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "manjka ime ukaza" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Uporaba: %s [IZBIRA] UKAZ [IZBIRA-UKAZA]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -922,7 +914,7 @@ msgstr "" "prevod posebej. Izhod programa postane izhod programa msgexec. Izhodna\n" "koda programa msgexec je najveèja od izhodnih kod pri klicu ukaza.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -931,7 +923,7 @@ msgstr "" "Poseben vgrajen ukaz ,0` izpi¹e prevod in izpis zakljuèi z znakom s kodo niè.\n" "Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -944,34 +936,34 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "izpis na standardni izhod neuspe¹en" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "posredovanje podatkov podprocesu %s neuspe¹no" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "manjka ime filtra" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "podan mora biti vsaj en skript v sed" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -980,7 +972,7 @@ msgstr "" "FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n" "vhoda in izpi¹e spremnjen prevod na standardni izhod.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -995,7 +987,7 @@ msgstr "" " ki se izvedejo\n" " -n, --quiet, --silent brez samodejnega izpisa prostora vzorcev\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1027,53 +1019,53 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "s podprocesom %s ni mogoèe vzpostaviti nebloène V/I povezave" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "povezava s podprocesom %s neuspe¹na" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "branje izhoda podprocesa %s neuspe¹no" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "podproces %s zakljuèil z izhodno kodo %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "argument %s mora biti eno samo loèilo" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s zahteva doloèitev \"-d directory\"" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s zahteva doloèitev \"-l locale\"" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s je veljavno edino z %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s je veljavno edino z %s ali %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" @@ -1082,7 +1074,7 @@ msgstr[1] "%d prevedeno sporo msgstr[2] "%d prevedeni sporoèili" msgstr[3] "%d prevedena sporoèila" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" @@ -1091,7 +1083,7 @@ msgstr[1] ", %d ohlapni prevod" msgstr[2] ", %d ohlapna prevoda" msgstr[3] ", %d ohlapni prevodi" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" @@ -1100,17 +1092,17 @@ msgstr[1] ", %d neprevedeno sporo msgstr[2] ", %d neprevedeni sporoèili" msgstr[3] ", %d neprevedena sporoèila" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporoèil.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1123,7 +1115,7 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe je vhodna datoteka enaka -, se bere standardni vhod.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1137,7 +1129,7 @@ msgstr "" " --java2 kot --java, privzeta je java2 (JDK 1.2 ali veè)\n" " --tcl naèin tcl: ustvarimo datoteko tcl/msgcat .msg\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1150,7 +1142,7 @@ msgstr "" " --strict izpis v strogi obliki Uniforum brez raz¹iritev GNU\n" "Èe je izhodna datoteka enaka -, se rezultat izpi¹e na standardni izhod.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1169,7 +1161,7 @@ msgstr "" "pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapi¹e v podani\n" "imenik.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1183,7 +1175,7 @@ msgstr "" " -d IMENIK korenski imenik hierarhije razredov\n" "Izbiri -l in -d sta obvezni. Datoteka .msg se zapi¹e v podani imenik.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1210,7 +1202,7 @@ msgstr "" " menujske izbire\n" " -f, --use-fuzzy uporabimo ohlapne samodejno prevedene prevode\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1221,7 +1213,7 @@ msgstr "" " -a, --alignment=©TEVILO poravnava nizov na dano ©TEVILO bajtov (privzeto %d)\n" " --no-hash binarni katalog sporoèil bo brez razpr¹ene tabele\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1236,25 +1228,25 @@ msgstr "" " --statistics s statistiko glede prevodov\n" " -v, --verbose z dodatnimi sporoèili med izvajanjem\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "rezultat izraza za izbiro mno¾inske oblike je lahko negativna vrednost" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" "nplurals = %lu, izraz za izbiro mno¾inske oblike pa lahko da vrednosti do %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "izraz za izbiro mno¾inske oblike lahko povzroèi deljenje z niè" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "izraz za izbiro mno¾inske oblike lahko povzroèi prekoraèitev obsega" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -1262,27 +1254,27 @@ msgstr "" "izraz za izbiro mno¾inske oblike lahko povzroèi aritmetiène napake, morda\n" "deljenje z niè" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "katalog sporoèil vsebuje mno¾inske oblike prevodov..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...v glavi pa manjka doloèilo \"plural=IZRAZ\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...v glavi pa manjka doloèilo \"nplurals=©TEVILO\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "neveljavna vrednost nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "neveljaven izraz za mno¾inske oblike" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." @@ -1292,7 +1284,7 @@ msgstr "nplurals = %lu..." # msgstr[1] "...nekatera sporoèila pa imajo samo %lu mno¾insko obliko" # msgstr[2] "...nekatera sporoèila pa imajo samo %lu mno¾inski obliki" # msgstr[3] "...nekatera sporoèila pa imajo samo %lu mno¾inske oblike" -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" @@ -1306,7 +1298,7 @@ msgstr[3] "...nekatera sporo # msgstr[1] "...nekatera sporoèila pa imajo %lu mno¾insko obliko" # msgstr[2] "...nekatera sporoèila pa imajo %lu mno¾inski obliki" # msgstr[3] "...nekatera sporoèila pa imajo %lu mno¾inske oblike" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" @@ -1315,12 +1307,12 @@ msgstr[1] "...nekatera sporo msgstr[2] "...nekatera sporoèila pa imajo %lu mno¾inski obliki" msgstr[3] "...nekatera sporoèila pa imajo %lu mno¾inske oblike" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Poskusite uporabiti naslednje, veljavno za %s:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1328,120 +1320,128 @@ msgstr "" "katalog sporoèil vsebuje mno¾inske oblike, manjka pa glava z doloèili\n" "\"Plural-Forms: nplurals=©TEVILO; plural=IZRAZ;\"" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "polji ,msgid` in ,msgid_plural` se ne zaèneta obe z ,\\n`" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "polji ,msgid` in ,msgstr[%u]` se ne zaèneta obe z ,\\n`" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "polji ,msgid` in ,msgstr` se ne zaèneta obe z ,\\n`" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "polji ,msgid` in ,msgid_plural` se ne konèata obe z ,\\n`" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "polji ,msgid` in ,msgstr[%u]` se ne konèata obe z ,\\n`" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "polji ,msgid' in ,msgstr` se ne konèata obe z ,\\n`" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "rokovanje z mno¾inskimi oblikami je raz¹iritev GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr ",%s` za razliko od ,msgid` ni veljaven formatni niz %s" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "v msgstr manjka oznaka bli¾njice ,%c`" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "v msgstr je preveè oznak bli¾njic ,%c`" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "v glavi manjka polje ,%s`\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "polje ,%s` v glavi se mora zaèeti na zaèetku vrstice\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "nekatera polja v glavi imajo ¹e vedno zaèetne privzete vrednosti\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "polje ,%s' ima ¹e vedno zaèetno privzeto vrednost\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "opozorilo: glava datoteke PO ni razberljiva\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "opozorilo: starej¹e izdaje msgfmt bodo pri tem javile napako\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "ime domene \"%s\" ni primerno kot ime datoteke" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "direktiva ,domain %s` ni bila upo¹tevana" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "podvojena definicija sporoèila" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...to je kraj prve definicije" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "prazno polje ,msgstr` zavr¾eno" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "ohlapni vnos za polje ,msgstr` zavr¾en" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "izbire ,%c` ni moè uporabiti, preden sta izbrana bodisi ,K` bodisi ,T`" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1450,7 +1450,7 @@ msgstr "" "Izvleèemo vsa sporoèila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n" "pripadajo dani izvorni datoteki.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1512,7 +1512,7 @@ msgstr "" " -f, --file=DATOTEKA VZOREC preberemo iz navedene datoteke\n" " -i, --ignore-case ne razlikujemo med velikimi in malimi èrkami\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1543,11 +1543,11 @@ msgstr "" " --sort-output izhod abecedno urejen po sporoèilih\n" " --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "pisanje podprocesu grep neuspe¹no" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1557,7 +1557,7 @@ msgstr "" "spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n" "Brez tega ne morete preizkusiti va¹ih prevodov.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1568,12 +1568,12 @@ msgstr "" "Prosim, izberite jezikovno okolje z izbiro --locale, ali pa\n" "doloèite izhodno datoteko PO z izbiro --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Ustvarjena datoteka %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1582,7 +1582,7 @@ msgstr "" "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n" "uporabnikovega jezikovnega okolja.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1595,7 +1595,7 @@ msgstr "" "Èe vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem imeniku.\n" "Èe je enaka -, se bere standardni vhod.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1609,7 +1609,7 @@ msgstr "" "nastavitev uporabnikovega jezikovnega okolja. Èe je kot izhodna datoteka \n" "podan -, se rezultat izpi¹e na standardni izhod.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1625,7 +1625,7 @@ msgstr "" " -w, --width=©TEVILO ¹irina strani pri izpisu, v znakih\n" " --no-wrap brez deljenja dolgih sporoèil v veè vrstic\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1633,11 +1633,11 @@ msgstr "" "Na¹li smo veè kot eno datoteko .pot.\n" "Prosim, doloèite vhodno datoteko .pot z izbiro --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "napaka pri branju trenutnega imenika" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1645,23 +1645,23 @@ msgstr "" "V trenutnem imeniku ni najti nobene datoteke .pot.\n" "Prosim, doloèite vhodno datoteko .pot z izbiro --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "klic fdopen() neuspe¹en" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "V/I napaka v podprocesu %s" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "podproces %s neuspe¹en z izhodno kodo %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1676,28 +1676,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Slovenski prevodi paketa %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "trenutno izbrani nabor \"%s\" ni prenosljivo ime kodnega nabora" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "v vhodni datoteki sta dva razlièna nabora znakov, \"%s\" in \"%s\"" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "vhodna datoteka ,%s` ne vsebuje glave z doloèitvijo nabora znakov" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1706,17 +1706,17 @@ msgstr "" "domena \"%s\" v vhodni datoteki ,%s` ne vsebuje glave z doloèitvijo nabora " "znakov<" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "opozorilo: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1725,7 +1725,7 @@ msgstr "" "UTF8.\n" "Izhod je pretvorjen v UTF8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1738,7 +1738,7 @@ msgstr "" "Izhod je pretvorjen v UTF8.\n" "Drugaèen kodni nabor lahko doloèite z izbiro --to-code.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1751,12 +1751,12 @@ msgstr "" "Izhod ,%s` bo morda napaèen.\n" "Predlagane re¹itve za to te¾avo so:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Nastavite LC_ALL na jezikovno okolje s kodnim naborom %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1767,7 +1767,7 @@ msgstr "" " zatem uporabite ,%s`,\n" " in ga konèno z ukazom ,msgconv` pretvorite nazaj v %s.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1780,7 +1780,7 @@ msgstr "" " zatem uporabite ,%s`,\n" " in ga konèno z ukazom ,msgconv` pretvorite nazaj v %s.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1791,15 +1791,15 @@ msgstr "" "Izhod ,%s` bo morda napaèen.\n" "Mogoèa re¹itev za to te¾avo je, da nastavite LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "pretvorba neuspe¹na" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "v vhodni datoteki manjka glava z doloèilom kodnega nabora" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1808,7 +1808,7 @@ msgstr "" "Pretvorba iz \"%s\" v \"%s\" ni mogoèa. %s klièe iconv(), ta pa ne podpira " "te pretvorbe." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1817,11 +1817,11 @@ msgstr "" "Pretvorba iz \"%s\" v \"%s\" ni mogoèa. %s klièe iconv(), vendar ta izvod " "programa ni preveden za uporabo iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "vrsta varnostne kopije" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1844,7 +1844,7 @@ msgstr "" "pa bodo strojno ustvarjeni komentarji in podatki o ¹tevilki vrstice. Kjer\n" "natanènega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1861,7 +1861,7 @@ msgstr "" " -C, --compendium=DATOTEKA dodatna knji¾nica s prevodi sporoèil; navedemo\n" " lahko veè kot eno\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1872,7 +1872,7 @@ msgstr "" " -U, --update posodobimo def.po,\n" " èe je ¾e posodobljen, ne storimo niè\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1902,7 +1902,7 @@ msgstr "" "Varnostna kopija ima pripono ,~`, razen èe ni z izbiro --suffix ali\n" "spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugaèe. \n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1917,15 +1917,15 @@ msgstr "" " -v, --verbose z ob¹irnej¹o razlago delovanja med potekom\n" " -q, --quiet, --silent brez kazalnika poteka\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "pri tem sporoèilu bi morale biti doloèene mno¾inske oblike" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "pri tem sporoèilu ne bi smele biti doloèene mno¾inske oblike" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1934,11 +1934,11 @@ msgstr "" "%sPrebrano %ld starih + %ld referenènih, zdru¾enih %ld, ohlapnih %ld, " "manjkajoèih %ld, opu¹èenih %ld.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " opravljeno.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s in izrecna imena datotek se med seboj izkljuèujejo" @@ -2089,12 +2089,12 @@ msgstr "" " -u, --unique vsako sporoèilo izpi¹emo le enkrat,\n" " dvojnike zavr¾emo\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Uporaba: %s [IZBIRA] [DOMENA] MSGID MSGID-PLURAL ©TEVEC\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2103,7 +2103,7 @@ msgstr "" "Prikaz prevoda besedilnega sporoèila, katerega slovnièna oblika je odvisna\n" "od ¹tevila.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2124,7 +2124,7 @@ msgstr "" " MSGID MSGID-PLURAL prevod MSGID (ednina) ali MSGID_PLURAL (mno¾ina)\n" " ©TEVEC doloèitev edninske/mno¾inske oblike\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2138,17 +2138,17 @@ msgstr "" "doloèimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n" "Privzet imenik s katalogom sporoèil: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: opozorilo: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2157,15 +2157,15 @@ msgstr "" "Nabor \"%s\" ni prenosljivo ime kodnega nabora.\n" "Pretvorba sporoèil v uporabnikov kodni nabor morda ne bo delovala.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Te¾avam navzlic nadaljujemo, prièakujte napake pri razèlembi." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Te¾avam navzlic nadaljujemo." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2174,7 +2174,7 @@ msgstr "" "Nabor \"%s\" ni podprt. %s se naslanja na iconv(),\n" "in iconv() ne podpira \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2182,12 +2182,12 @@ msgstr "" "Namestitev knji¾nice GNU libiconv in ponovno prevajanje paketa\n" "GNU Gettext bi moralo odpraviti to te¾avo.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2196,7 +2196,7 @@ msgstr "" "Nabor \"%s\" ni podprt. %s se naslanja na iconv().\n" "Ta izdaja je bila prevedena brez iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2229,79 +2229,79 @@ msgid "plural form has wrong index" msgstr "mno¾inska oblika ima napaèen indeks" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "preveè napak, nadaljevanje ni mo¾no" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "neveljavno veèzlo¾no zaporedje" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "nepopolno veèzlo¾no zaporedje na koncu datoteke" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "nepopolno veèzlo¾no zaporedje na koncu vrstice" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv neuspe¹en" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "napaka pri branju \"%s\"" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "kljuèna beseda \"%s\" neprepoznana" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "neveljavno krmilno zaporedje" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "znak za konec datoteke sredi niza" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "znak za konec vrstice sredi niza" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "datoteka \"%s\" je okrnjena" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "datoteka \"%s\" vsebuje niz, ki ni zakljuèen z NUL" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "datoteka \"%s\" ni v obliki GNU .mo" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "datoteka \"%s\" vsebuje pri %s niz, ki ni zakljuèen z NUL" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "prièakujemo dva argumenta" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Uporaba: %s [IZBIRA] URL DATOTEKA\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2310,53 +2310,53 @@ msgstr "" "Prinese in izpi¹e vsebino podanega URL. Èe URL ni dosegljiv, se uporabni\n" "krajevno dostopna DATOTEKA.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "napaka pri pisanju na standardni izhod" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "zaèasnega imenika ni mogoèe najti, poskusite nastaviti $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "ni mogoèe ustvariti zaèasnega imenika z vzorcem \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "ni veljavno javansko ime razreda: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "ustvarjanje \"%s\" neuspe¹no" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "napaka pri pisanju na datoteko \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "prevajanje javanskega razreda neuspe¹no, uporabite --verbose ali nastavite " "$JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "napaka pri pisanju na \"%s\"" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2371,65 +2371,65 @@ msgstr "" "vi. Razmislite o uporabi sporoèil v naboru znakov ASCII.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standardni izhod" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: opozorilo: nezakljuèena znakovna konstanta" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: opozorilo: nezakljuèen niz" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "ta datoteka morda ne vsebuje direktiv domene" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: neveljavna definicija niza" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: za # manjka ¹tevilka" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: niz ni veljaven izraz" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ne deluje brez kljuènih besed, ki naj jih i¹èe" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "opozorilo: vrsta datoteka ,%s' s pripono ,%s' ni prepoznana; posku¹amo C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Iz vhodnih datotek izvleèemo prevedljive nize znakov.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2438,7 +2438,7 @@ msgstr "" "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n" "tudi za kratko obliko. Enako za neobvezne argumente.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2454,14 +2454,14 @@ msgstr "" "Èe je kot izhodna datoteka navedeno -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2472,7 +2472,16 @@ msgstr "" " -C, --c++ okraj¹ava za --language=C++\n" "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2487,7 +2496,7 @@ msgstr "" " -c, --add-comments[=ZNAÈKA] v vhodno datoteko dodamo komentar z navedeno\n" " ZNAÈKO\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2505,7 +2514,7 @@ msgstr "" " --debug bolj razèlenjen rezultat razpoznave\n" " oblikovnega niza\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2546,11 +2555,18 @@ msgstr "" " -m, --msgstr-prefix[=NIZ] NIZ ali \"\" kot predpona za msgstr\n" " -m, --msgstr-suffix[=NIZ] NIZ ali \"\" kot pripona za msgstr\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "standardni vhod" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2560,7 +2576,7 @@ msgstr "" "gettext(\"\") vrne glavo z metapodatki, ne pa\n" "praznega niza.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "jezik ,%s` ni poznan" diff --git a/po/sv.gmo b/po/sv.gmo index 2fa22d032..c14efb24a 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index d877e76fe..a538da5ce 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-08-08 11:43+0200\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" @@ -15,148 +15,148 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "ogiltigt argument \"%s\" för \"%s\"" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "tvetydigt argument \"%s\" för \"%s\"" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Giltiga argument är:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fel uppstod när \"%s\" öppnades för läsning" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "kan inte öppna säkerhetskopiefil \"%s\" för skrivning" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "fel uppstod då \"%s\" lästes" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "fel vid skrivning till \"%s\"" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "fel efter \"%s\" lästes" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Okänt systemfel" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s-barnprocess misslyckades" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" är tvetydig\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tar inget argument\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flaggan \"%s\" kräver ett argument\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: okänd flagga \"--%s\"\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: okänd flagga \"%c%s\"\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: otillåten flagga -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ogiltig flagga -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flaggan kräver ett argument -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" är tvetydig\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tar inget argument\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "minnet slut" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "kan inte skapa rör" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s-barnprocess" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s-barnprocess fick ödesdiger signal %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "antalet formateringsdirektiv i \"msgid\" och \"%s\" är olika" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" @@ -164,8 +164,8 @@ msgstr "" "formateringsdirektivet i \"msgid\" och \"%s\" för argument %u är inte " "likadana" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" @@ -173,13 +173,13 @@ msgstr "" "formateringsdirektiv för argument \"%u\", som i \"%s\", finns inte i \"msgid" "\"" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "formateringsdirektiv för argument %u finns inte i \"%s\"" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -187,12 +187,12 @@ msgid "" msgstr "" "formateringsdirektiv för argument {%u}, som i \"%s\", finns inte i \"msgid\"" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "formateringsdirektiv för argument {%u} finns inte i \"%s\"" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" @@ -200,17 +200,17 @@ msgstr "" "formateringsdirektiv i \"msgid\" och \"%s\" för argument {%u} är inte " "likadana" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "formateringsdirektiv i \"msgid\" och \"%s\" är inte ekvivalenta" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "formateringsdirektiv i \"%s\" är inte en delmängd av de i \"msgid\"" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -218,7 +218,7 @@ msgid "" msgstr "" "formateringsdirektiv i \"msgid\" tar en avbildning, de i \"%s\" tar en tupel" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -226,7 +226,7 @@ msgid "" msgstr "" "formateringsdirektiv i \"msgid\" tar en tupel, de i \"%s\" tar en avbildning" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " @@ -235,12 +235,12 @@ msgstr "" "formateringsdirektiv för argument \"%s\", som i \"%s\", finns inte i \"msgid" "\"" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "formateringsdirektiv för argument \"%s\" finns inte i \"%s\"" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" @@ -248,11 +248,11 @@ msgstr "" "formateringsdirektiv i \"msgid\" och \"%s\" för argument \"%s\" är inte " "likadana" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -264,33 +264,33 @@ msgstr "" "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n" "ÄNDAMÅL.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "Skrivet av %s.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "för många argument" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argument saknas" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Försök med \"%s --help\" för mer information.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -299,12 +299,12 @@ msgstr "" "Användning: %s [FLAGGA] [[TEXTDOMÄN] MSGID]\n" "eller %s [FLAGGA] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Visa lokala språkets översättning av textmeddelande.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -325,7 +325,7 @@ msgstr "" " [TEXTDOMÄN] MSGID hämta översatt meddelande som motsvarar\n" " MSGID från TEXTDOMÄN\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -345,27 +345,27 @@ msgstr "" "översätts de argument som hittas i den valda meddelandekatalogen.\n" "Normal katalog för meddelandekataloger: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" "Rapportera fel till .\n" "Rapportera fel och synpunkter på översättningen till .\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Användning: %s [FLAGGA]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Visa maskinens värdnamn.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -379,9 +379,9 @@ msgstr "" " -f, --fqdn, --long långt värdnamn, innehåller hela domännamnet och alias\n" " -i, --ip-address adresser för värdnamnet\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -392,32 +392,32 @@ msgstr "" " -h, --help visa denna hjälptext och avsluta\n" " -V, --version visa versionsinformation och avsluta\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "kunde inte hämta värdnamn" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "högst en infil tillåten" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s och %s är ömsesidigt uteslutande" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Användning: %s [FLAGGA] [INFIL]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -426,15 +426,15 @@ msgstr "" "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n" "manipulerar attributen.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -447,8 +447,8 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om ingen infil är given eller om den är - läses standard in.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -460,7 +460,7 @@ msgstr "" " -o, --output-file=FIL skriv resultat till angiven fil\n" "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -479,7 +479,7 @@ msgstr "" " --no-obsolete ta bort föråldrade #~ meddelanden\n" " --only-obsolete behåll föråldrade #~ meddelanden\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -498,7 +498,7 @@ msgstr "" " --fuzzy samma som --only-fuzzy --clear-fuzzy\n" " --obsolete samma som --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -531,12 +531,12 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "omöjligt urvalskriterium angivet (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Användning: %s [FLAGGA] [INFIL]...\n" @@ -564,7 +564,7 @@ msgstr "" "utom om --use-first ges. Då tas de endast från den första PO-filen som\n" "definierar dem. Filpositioner från alla filer bevaras.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -579,7 +579,7 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om infil är - läses standard in.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -650,7 +650,7 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition \n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -661,20 +661,20 @@ msgstr "" " -h, --help visa denna hjälptext och avsluta\n" " -V, --version visa versionsinformation och avsluta\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "inga infiler givna" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "exakt 2 infiler krävs" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Användning: %s [FLAGGA] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -692,7 +692,7 @@ msgstr "" "programmet. Om en exakt likhet inte kan hittas används luddig jämförelse \n" "för att ge bättre felmeddelanden.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -705,7 +705,7 @@ msgstr "" " ref.pot referenser till källkod\n" " -D, --directory=KATALOG sök infiler även i KATALOG\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -714,43 +714,35 @@ msgstr "" "Bearbetningsvarianter:\n" " -m, --multi-domain tillämpa ref.pot till alla domäner i def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "detta meddelande används men är inte definierat..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...men denna definition är likartad" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "detta meddelande används men är inte definierat i %s" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "varning: detta meddelande används inte" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d allvarligt fel hittat" msgstr[1] "%d allvarliga fel hittades" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "meddelandedefinitionen är dubblerad" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...detta är platsen för den första definitionen" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "minst två filer måste anges" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -771,7 +763,7 @@ msgstr "" "endast från den första PO-filen som definierar dem. Filpositioner från\n" "alla filer bevaras.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -791,7 +783,7 @@ msgstr "" " -u, --unique samma som --less-than=2, begär att\n" " endast unika meddelanden skrivs\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -842,7 +834,7 @@ msgstr "" " -t, --to-code=NAMN Kodning för utdata\n" "Standardvärde är nuvarande lokals kodning.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -875,11 +867,11 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "inga infiler givna" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "exakt en infil krävs" @@ -914,16 +906,16 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om infil är - läses standard in.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "kommandonamn saknas" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Användning: %s [FLAGGA] KOMMANDO [KOMMANDOFLAGGOR]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -938,7 +930,7 @@ msgstr "" "blir utdata från msgexec. Slutstatusvärdet för msgexec är det maximala\n" "slutstatusvärdet för alla kommandokörningar.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -948,7 +940,7 @@ msgstr "" "av ett nolltecken. Utdata för \"msgexec 0\" är lämpligt som indata för\n" "\"xargs -O\"\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -961,34 +953,34 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om ingen infil är given eller om den är - läses standard in.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "skrivning till standard ut misslyckades" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "skrivning till %s-barnprocess misslyckades" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "filternamn saknas" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "minst ett sed-skript måste anges" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Tillämpar ett filter på alla översättningar i en meddelandekatalog.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -997,7 +989,7 @@ msgstr "" "FILTER kan vara vilket program som helst som läser en översättning från\n" "standard in och skriver den modifierade översättningen till standard ut.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1012,7 +1004,7 @@ msgstr "" " att exekvera\n" " -n, --quiet, --silent undertryck automatisk utskrift av resultat\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1047,84 +1039,84 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "kan inte sätta upp icke-blockerande I/O till %s-barnprocess" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "kommunikation med %s-barnprocess misslyckades" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "läsning från %s-barnprocess misslyckades" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s-barnprocess avslutade med slutstatus %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "argumentet till %s ska vara ett enskilt skiljetecken" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s kräver att \"-d katalog\" anges" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s kräver att \"-l lokal\" anges" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s är endast giltig med %s" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s är endast giltig med %s eller %s" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d översatt meddelande" msgstr[1] "%d översatta meddelanden" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d luddig översättning" msgstr[1] ", %d luddiga översättningar" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d oöversatt meddelande" msgstr[1] ", %d oöversatta meddelanden" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Användning: %s [FLAGGA] filnamn.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1137,7 +1129,7 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om infil är - läses standard in.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1150,7 +1142,7 @@ msgstr "" " --java2 som --java, och anta Java2 (JDK 1.2 eller högre)\n" " --tcl Tcl-läge: generera en .msg-fil av tcl/msgcat-typ\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1163,7 +1155,7 @@ msgstr "" " --strict strikt Uniforum-format på resultatet\n" "Om UTFIL är - skrivs resultatet till standard ut.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1182,7 +1174,7 @@ msgstr "" "avskiljt med ett understreck. Flaggan -d är obligatorisk. Klassen skrivs\n" "till den givna katalogen.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1197,7 +1189,7 @@ msgstr "" "Flaggorna -l och -d är obligatoriska. .msg-filen skrivs till den givna \n" "katalogen.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1225,7 +1217,7 @@ msgstr "" " för menyer\n" " -f, --use-fuzzy använd luddiga poster i resultatet\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1236,7 +1228,7 @@ msgstr "" " -a, --alignment=TAL lägg strängar på jämna TAL byte (normalt: %d)\n" " --no-hash binärfil innehåller inte hashtabellen\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1251,74 +1243,74 @@ msgstr "" " --statistics skriv ut statistik om översättningarna\n" " -v, --verbose öka mängden information i meddelanden\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "pluraluttryck kan producera negativa värden" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu men pluraluttryck kan ge värden upp till %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "pluraluttryck kan ge division med noll" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "pluraluttryck kan ge överflöde av heltal" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "pluraluttryck kan ge aritmetiska fel, möjligen division med noll" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "meddelandekatalog har översättningar med pluralform..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...men huvudrader saknar attribut av typ \"plurals=UTTRYCK\"" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...men huvudrader saknar attribut av typ \"plurals=HELTAL\"" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "ogiltigt värde för nplurals" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "ogiltigt pluraluttryck" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...men några meddelanden har bara en pluralform" msgstr[1] "...men några meddelanden har bara %lu pluralformer" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...men några meddelanden har en pluralform" msgstr[1] "...men några meddelanden har %lu pluralformer" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Försök använda den här, gäller för \"%s\":\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1326,123 +1318,131 @@ msgstr "" "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad " "med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\"" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "\"msgid\"- och \"msgid_plural\"-raderna börjar inte båda med \"\\n\"" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna börjar inte båda med \"\\n\"" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\"" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\"" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna slutar inte båda med \"\\n\"" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\"" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "hantering av plural är en utökning i GNU gettext" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "" "\"%s\" är inte en giltig formatsträng i %s, till skillnad från \"msgid\"" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "huvudrad \"%s\" saknas i huvudet\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "huvudrad \"%s\" bör ligga i början på raden\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "vissa huvudrader har kvar initiala standardvärden\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "" "varning: konvertering till användarens teckenuppsättning kommer att " "misslyckas.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "varning: PO-filens huvudrader är luddiga\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "domännamnet \"%s\" är inte lämpligt som filnamn" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "direktivet \"domain %s\" ignoreras" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "meddelandedefinitionen är dubblerad" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...detta är platsen för den första definitionen" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "tom \"msgstr\"-rad ignorerad" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "luddig \"msgstr\"-rad ignorerad" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: varning: källfilen innehåller luddiga översättningar" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "flagga \"%c\" kan inte användas förrän \"K\" eller \"T\" angivits" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1451,7 +1451,7 @@ msgstr "" "Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n" "mönster eller hör till någon given källkodsfil.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1509,7 +1509,7 @@ msgstr "" " -f, --file=FIL hämta MÖNSTER från FIL\n" " -i, --ignore-case versaler och gemener jämförs lika\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1542,11 +1542,11 @@ msgstr "" " --sort-output sortera resultatet\n" " --sort-by-file sortera resultatet efter filposition\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "skrivning till grep barnprocess misslyckades" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1556,7 +1556,7 @@ msgstr "" "LANG såsom beskrivs i filen ABOUT-NLS. Detta är nödvändigt för att\n" "du ska kunna testa dina översättningar.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1567,12 +1567,12 @@ msgstr "" "Ange lokal med flaggan --locale eller\n" ".po-utfilen med flaggan --output-file.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "Skapade %s.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1581,7 +1581,7 @@ msgstr "" "Skapar en ny PO-fil och initierar metainformation med värden från\n" "användarens miljövariabler.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1594,7 +1594,7 @@ msgstr "" "Om ingen infil ges söks POT-filen i aktuell katalog.\n" "Om den är - läses standard in.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1607,7 +1607,7 @@ msgstr "" "Om ingen utfil ges beror den på flaggan --locale eller användarens\n" "lokalinställning. Om den är - skrivs resultatet till standard ut.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1624,7 +1624,7 @@ msgstr "" " --no-wrap dela inte meddelanden som är längre än\n" " resultatets kolumnantal i flera rader\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1632,11 +1632,11 @@ msgstr "" "Hittade fler än en .pot-fil.\n" "Ange .pot-infil med flaggan --input.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "fel vid läsning av aktuell katalog" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1644,23 +1644,23 @@ msgstr "" "Hittade ingen .pot-fil i aktuell katalog.\n" "Ange .pot-infil med flaggan --input.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() misslyckades" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "I/O-fel i %s-barnprocess" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s-barnprocess terminerade med slutstatus %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1675,28 +1675,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "Svenska översättningar för paket %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "nuvarande teckenuppsättning \"%s\" är inte ett portabelt kodningsnamn" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "infilen \"%s\" saknar en huvudrad som anger teckenuppsättning" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1704,17 +1704,17 @@ msgid "" msgstr "" "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "varning: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1722,7 +1722,7 @@ msgstr "" "Infiler har meddelanden med flera kodningar, däribland UTF-8.\n" "Konverterar resultatet till UTF-8.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1734,7 +1734,7 @@ msgstr "" "Konverterar resultatet till UTF-8.\n" "Använd flaggan --to-code för att välja en annan kodning.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1747,12 +1747,12 @@ msgstr "" "Resultatet för \"%s\" kan bli felaktigt.\n" "Möjliga sätt att komma runt problemet är:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- Sätt LC_ALL till en lokal med kodning %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1763,7 +1763,7 @@ msgstr "" " tillämpa därefter \"%s\",\n" " konvertera sedan tillbaka till %s med \"msgconv\".\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1776,7 +1776,7 @@ msgstr "" " tillämpa därefter \"%s\"\n" " konvertera sedan tillbaka till %s med \"msgconv\".\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1787,15 +1787,15 @@ msgstr "" "Resultatet för \"%s\" kan bli felaktigt.\n" "Ett möjligt sätt att komma runt problemet är att sätta LC_ALL=C.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "konverteringsfel" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "infilen saknar en huvudrad som anger teckenuppsättning" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1804,7 +1804,7 @@ msgstr "" "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv()\n" "och iconv() stöder inte denna konvertering." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1813,11 +1813,11 @@ msgstr "" "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n" "Denna version byggdes utan iconv()." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "säkerhetskopieringstyp" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1840,7 +1840,7 @@ msgstr "" "dock bevaras punktkommentarer och filpositioner. Om en exakt likhet\n" "inte kan hittas används luddig jämförelse för att ge bättre resultat.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1857,7 +1857,7 @@ msgstr "" " -C, --compendium=FIL ytterligare kataloger med översättningar,\n" " kan anges flera gånger\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1868,7 +1868,7 @@ msgstr "" " -U, --update updatera def.po,\n" " gör ingenting om def.po redan är aktuell\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1897,7 +1897,7 @@ msgstr "" "Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n" "miljövariabeln SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1912,15 +1912,15 @@ msgstr "" " -v, --verbose öka mängden information i meddelanden\n" " -q, --quiet, --silent visa inte framstegsindikatorer\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "detta meddelande ska definiera pluralformer" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "detta meddelande ska inte definiera pluralformer" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1929,11 +1929,11 @@ msgstr "" "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld " "saknade, %ld föråldrade.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " klar.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s och explicita filnamn är ömsesidigt uteslutande" @@ -2085,12 +2085,12 @@ msgstr "" " -d, --repeated skriv bara duplicerade meddelanden\n" " -u, --unique skriv bara unika meddelanden, duplikat kastas\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Användning: %s [FLAGGA] [TEXTDOMÄN] MSGID MSGID-PLURAL ANTAL\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -2099,7 +2099,7 @@ msgstr "" "Visa översättningar i det lokala språket av textmeddelanden vars grammatiska\n" "form beror på ett tal.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2120,7 +2120,7 @@ msgstr "" " MSGID MSGID-PLURAL översätt MSGID (singular) / MSGID-PLURAL (plural)\n" " ANTAL välj singular/plural baserat på detta värde\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2134,17 +2134,17 @@ msgstr "" "kan en annan katalog anges med miljövariabeln TEXTDOMAINDIR.\n" "Normal katalog för meddelandekataloger: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: varning: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2153,15 +2153,15 @@ msgstr "" "Teckenuppsättning \"%s\" är inte namn på en portabel kodning.\n" "Meddelandekonvertering till användarens teckenuppsättning kan misslyckas.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Fortsätter ändå, tolkningsfel kan förväntas." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Fortsätter ändå." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2170,7 +2170,7 @@ msgstr "" "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv(),\n" "och iconv() stöder inte \"%s\".\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2178,12 +2178,12 @@ msgstr "" "Installation av GNU libiconv med efterföljande ominstallation av\n" "GNU gettext skulle lösa detta problem.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2192,7 +2192,7 @@ msgstr "" "Teckenuppsättning \"%s\" stöds ej. %s beror på iconv().\n" "Denna version byggdes utan iconv().\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2226,80 +2226,80 @@ msgid "plural form has wrong index" msgstr "pluralform har fel index" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "för många fel, avbryter körningen" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "ogiltig flerbytesekvens" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "ofullständig flerbytesekvens i slutet på filen" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "ofullständig flerbytesekvens i slutet på raden" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv misslyckades" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "fel uppstod då \"%s\" lästes" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "nyckelordet \"%s\" är okänt" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "ogiltig kontrollsekvens" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "filslut inne i en sträng" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "radslut inne i en sträng" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "filen \"%s\" är avkortad" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "filen \"%s\" är inte på GNUs .mo-format" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet vid %s" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "förväntade två argument" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Användning: %s [FLAGGA] URL FIL\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2308,52 +2308,52 @@ msgstr "" "Hämtar och skriver ut innehållet på URL. Om URL inte kan hämtas används\n" "den lokala filen FIL istället.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "fel vid skrivning till standard ut" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "kan inte hitta temporärkatalog, försök sätta $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "kan inte skapa temporärkatalog med mallen \"%s\"" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "inte ett giltigt Javaklassnamn: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "misslyckades med att skapa \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "fel vid skrivning till filen \"%s\"" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "fel uppstod när \"%s\" öppnades för skrivning" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\"" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2366,65 +2366,65 @@ msgstr "" "som är en annan än din. Försök använda en ren ASCII-msgid istället.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan inte skapa utfilen \"%s\"" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standard ut" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: varning: oavslutad teckenkonstant" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: varning: oavslutad sträng" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "denna fil kan inte innehålla domändirektiv" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: ogiltig strängdefinition" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d fattas tal efter #" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: ogiltigt strängmönster" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan inte användas då resultatet skrivs till standard ut" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext måste ha nyckelord att söka efter för att fungera" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extrahera översättbara strängar från givna infiler.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2433,7 +2433,7 @@ msgstr "" "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n" "Motsvarande gäller för frivilliga argument.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2448,14 +2448,14 @@ msgstr "" " -p, --output-dir=KATALOG utfiler placeras i katalogen KATALOG\n" "Om utfilen är - skrivs resultatet till standard ut.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2467,7 +2467,16 @@ msgstr "" " -C, --c++ samma som --language=C++\n" "I normalläge gissas språket från filändelsen på infilen.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2482,7 +2491,7 @@ msgstr "" " -c, --add-comments[=MÄRKE] skriv kommentarsblock med MÄRKE (eller de\n" " före nyckelordsrader) till resultatet\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2499,7 +2508,7 @@ msgstr "" " -T, --trigraphs hantera ANSI C treteckenssekvenser i infiler\n" " --debug mer detaljerad igenkänning av formatsträngar\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2542,11 +2551,18 @@ msgstr "" " -m, --msgstr-prefix[=STRÄNG] inled översatta strängar med STRÄNG eller \"\"\n" " -M, --msgstr-suffix[=STRÄNG] avsluta översatta strängar med STRÄNG eller \"\"\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "standard in" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2556,7 +2572,7 @@ msgstr "" "gettext(\"\") returnerar huvudet med metainformation,\n" "inte den tomma strängen.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "språket \"%s\" okänt" diff --git a/po/tr.gmo b/po/tr.gmo index 0d869601b..96f0f9447 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 3b9129f02..59ff7ea10 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.5\n" -"POT-Creation-Date: 2002-08-20 15:24+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-09-11 17:27+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -15,170 +15,170 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 0.9.6\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "argüman `%s' `%s' için geçersiz" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "argüman `%s' `%s' için belirsiz" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "Geçerli argümanlar:" -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:267 -#: src/urlget.c:204 src/xgettext.c:840 src/xgettext.c:853 src/xgettext.c:863 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "\"%s\" okunmak için açılırken hata" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "\"%s\" yedek dosyası yazılmak için açılırken hata" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "\"%s\" okunurken hata" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "\"%s\" yazılırken hata" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "\"%s\" okunduktan sonra hata" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s alt süreci başarısız" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s' seçeneği belirsiz\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneği argümansız kullanılır\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' seçeneği bilinmiyor\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' seçeneği bilinmiyor\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: kuraldışı seçenek -- %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: seçenek için bir argüman gerekli -- %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneği belirsiz\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "" "Java derleyici bulunamadı, ya gcj kurun ya da $JAVAC değişkenini belirleyin" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "" "Java sanal makinası bulunamadı,\n" "ya gij kurun ya da $JAVA değişkenini belirleyin" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "bellek tükendi" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "veriyolu oluşturulamıyor" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s alt süreci" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s alt süreci ölümcül sinyal %d aldı" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "" "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " @@ -186,29 +186,29 @@ msgid "" msgstr "" "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "{%u}.argüman için '%s' içinde bir biçem belirteci yok" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri aynı değil" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "" "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -217,7 +217,7 @@ msgstr "" "`msgid' içindeki biçem belirteçleri ile bir eşlem umulurken '%s' " "içindekilerle bir işlem umuluyor" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -226,29 +226,29 @@ msgstr "" "`msgid' içindeki biçem belirteçleri ile bir işlem umulurken '%s' " "içindekilerle bir eşlem umuluyor" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "'%2$s' içinde '%1$s' için 'msgid' içinde bir biçem belirteci yok" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "'%s' için '%s' içinde bir biçem belirteci yok" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:381 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -260,33 +260,33 @@ msgstr "" "Hiçbir garantisi yoktur; hatta SATILABÄ°LÄ°RLİĞİ veya ŞAHSÄ° KULLANIMINIZA\n" "UYGUNLUĞU için bile garanti verilmez.\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:386 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "%s tarafından yazıldı.\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "çok fazla argüman" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "argümanlar eksik" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:540 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -295,12 +295,12 @@ msgstr "" "Kullanımı: %s [SEÇENEK] [[PAKET] MSGID]\n" "ya da: %s [SEÇENEK] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Bir iletinin anadile çevirisini gösterir.\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -320,7 +320,7 @@ msgstr "" " -V, --version sürüm bilgilerini gösterir ve çıkar\n" " [PAKET] MSGID PAKET.mo dosyasından MSGID ile ilişkili çeviriyi alır\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -339,27 +339,27 @@ msgstr "" "Ancak iletiyi standart çıktıya basitçe kopyalamak yerine çevirisini verir.\n" "Standart arama dizini: %s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:637 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "" "Yazılım hatalarını adresine,\n" "Çeviri hatalarını adresine bildiriniz.\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Kullanımı: %s [SEÇENEK]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "Makina ismini gösterir.\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -374,9 +374,9 @@ msgstr "" " içerir\n" " -i, --ip-address makinanın IP adresi\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -387,32 +387,32 @@ msgstr "" " -h, --help Bu yardımı gösterir ve çıkar\n" " -V, --version Sürüm bilgilerini gösterir ve çıkar\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "makina ismi alınamadı" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "en fazla bir girdi dosyasına izin var" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:396 -#: src/xgettext.c:400 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ile %s bağdaşmıyor" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Kullanımı: %s [SEÇENEK] [GÄ°RDÄ°DOSYASI]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -421,15 +421,15 @@ msgstr "" "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n" "ve özellikleri uygular.\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -442,8 +442,8 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N Girdi dosyalarının arama yoluna DÄ°ZÄ°Ni ekler\n" "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -456,7 +456,7 @@ msgstr "" "Çıktı dosyası verilmemişse ya da yerine - verilmişse sonuçlar standart\n" "çıktıya yazılır.\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -475,7 +475,7 @@ msgstr "" " --no-obsolete eski #~ iletileri silinir.\n" " --only-obsolete eski #~ iletileri tutulur.\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -494,7 +494,7 @@ msgstr "" " --fuzzy --only-fuzzy --clear-fuzzy için kısaltma\n" " --obsolete --only-obsolete --clear-obsolete için kısaltma\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -526,12 +526,12 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:545 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Kullanımı: %s [SEÇENEK] [GÄ°RDÄ°DOSYASI]...\n" @@ -560,7 +560,7 @@ msgstr "" "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n" "alınır.\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:561 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -575,7 +575,7 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N girdi dosyalarının arama yoluna DÄ°ZÄ°N eklenir\n" "Girdi dosyası - ise standart girdi okunur.\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -647,7 +647,7 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:631 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -658,20 +658,20 @@ msgstr "" " -h, --help Bu yardımı gösterir ve çıkar\n" " -V, --version Sürüm bilgilerini gösterir ve çıkar\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "hiçbir girdi dosyası verilmemiş" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "tam olarak 2 girdi dosyası gerekli" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Kullanımı: %s [SEÇENEK] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -687,7 +687,7 @@ msgstr "" "ve çevirisini kontrol etmek için kullanışlıdır. Zorunlu eşleşme bulunamazsa,\n" "belirsiz (fuzzy) eşleştirme yapılır.\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -701,7 +701,7 @@ msgstr "" " dosya\n" " -D, --directory=DÄ°ZÄ°N girdi dosyaları arama yoluna eklenecek DÄ°ZÄ°N\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -710,43 +710,35 @@ msgstr "" "İşlem seçenekleri:\n" " -m, --multi-domain ref.pot'u tüm def.po dosyalarına uygular\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "bu ileti kullanıldı ama tanımlı değil..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...ama bu tanımlama benzer" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "bu ileti kullanıldı ama %s'de tanımlı değil" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "uyarı: bu ileti kullanılmamış" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "%d ölümcül hata bulundu" msgstr[1] "%d ölümcül hata bulundu" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "ileti iki defa tanımlanmış" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...bu ilk tanımlamanın konumu" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "en az iki dosya belirtilmelidir" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -768,7 +760,7 @@ msgstr "" "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n" "korunmuş olacaktır.\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -790,7 +782,7 @@ msgstr "" " -u, --unique --less-than=2 için kısaltma, sadece tek olan\n" " iletiler gösterilir\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -840,7 +832,7 @@ msgstr "" " -t, --to-code=Ä°SÄ°M çıktı için kodlama belirtilir\n" "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -872,11 +864,11 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:417 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "hiç girdi dosyası verilmemiş" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "tam olarak 1 girdi dosyası gerekli" @@ -911,16 +903,16 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N Girdi dosyalarının arama yoluna DÄ°ZÄ°Ni ekler\n" "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "komut ismi eksik" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Kullanımı: %s [SEÇENEK] KOMUT [KOMUT-SEÇENEĞİ]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -935,7 +927,7 @@ msgstr "" "çıktısı olarak görünür. msgexec dönüş kodu olarak tüm çağrılardan\n" "elde edilen en yüksek dönüş kodunu verir.\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -944,7 +936,7 @@ msgstr "" "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n" "çıktılar. \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -957,34 +949,34 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N Girdi dosyalarının arama yoluna DÄ°ZÄ°Ni ekler\n" "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "standart çıktıya yazılamadı" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "%s alt sürecine yazılamadı" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "süzgeç ismi eksik" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "en az bir sed betiği belirtilmelidir" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Kullanımı: %s [SEÇENEK] SÜZGEÇ [SÜZGEÇ-SEÇENEĞİ]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -993,7 +985,7 @@ msgstr "" "SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n" "standart çıktıya yazabilen herhangi bir programdır.\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1008,7 +1000,7 @@ msgstr "" " içeriğini ekler\n" " -n, --quiet, --silent standart çıktı iletilerini engeller\n" -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1042,84 +1034,84 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "%s alt süreci ile haberleşilemedi" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "%s alt sürecinden okunamadı" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "%s argümanı bir noktalama işareti olmalıydı" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s sadece %s ile geçerlidir" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s sadece %s ya da %s ile geçerlidir" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d çevrilmiş ileti" msgstr[1] "%d çevrilmiş ileti" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d belirsiz çeviri" msgstr[1] ", %d belirsiz çeviri" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d çevrilmemiş ileti" msgstr[1] ", %d çevrilmemiş ileti" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1132,7 +1124,7 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N Girdi dosyalarının arama yoluna DÄ°ZÄ°Ni ekler\n" "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1145,7 +1137,7 @@ msgstr "" " --java2 --java gibi, ama Java2 (JDK 1.2 ve üstü) kabul eder\n" " --tcl Tcl kipi: bir tcl/msgcat .msg dosyası üretir\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1158,7 +1150,7 @@ msgstr "" " --strict Uniforum kipini etkinleştirir\n" "Çıktı dosyası verilmemişse ya da yerine - verilmişse standart çıktıya yazılır.\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1176,7 +1168,7 @@ msgstr "" "Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n" "saptanır. Sınıf DÄ°ZÄ°Ne yazılacağından -d seçeneği zorunludur.\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1190,7 +1182,7 @@ msgstr "" " -d DÄ°ZÄ°N .msg ileti kataloglarının ana dizini\n" ".msg dosyası DÄ°ZÄ°Nde olacağından -l ve -d seçenekleri zorunludur.\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1219,7 +1211,7 @@ msgstr "" " denetler\n" " -f, --use-fuzzy çıktıda fuzzy girdileri kullanır\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1230,7 +1222,7 @@ msgstr "" " -a, --alignment=SAYI dizgeleri SAYI bayta ayarlar (öntanımlı: %d)\n" " --no-hash ikilik dosya saçılma tablosunu içermeyecek\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1245,75 +1237,75 @@ msgstr "" " --statistics çeviri istatistiklerini gösterir\n" " -v, --verbose sonuçlar daha ayrıntılı verilir\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "çoğul ifadeler negatif değerler üretebilir" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu ama çoğul ifadeler en çok %lu değer üretebilir" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "çoğul ifade sıfırla bölme hatası üretebilir" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "çoğul ifade tamsayı taşması üretebilir" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "" "çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "ileti kataloğu çoğul çeviriler içeriyor" -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...ama başlıkta \"plural=Ä°FADE\" gibi bir şey yok" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "nplurals değeri geçersiz" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "plural= ile verilen ifade geçersiz" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor" msgstr[1] "...ama bazı iletiler sadece %lu çoğul biçem içeriyor" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor" msgstr[1] "...ama bazı iletiler %lu çoğul biçem içeriyor" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "Aşağıdakiler %s için geçerli mi bakılacak:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1321,121 +1313,129 @@ msgstr "" "ileti kataloğu çoğul çeviriler içermesine rağmen başlıkta\n" "\"Plural-Forms: nplurals=TAMSAYI; plural=Ä°FADE;\" gibi bir şey yok." -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "" "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "çoğul biçemler bir GNU gettext özelliğidir" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "içinde '%c' tuş kısayolu eksik" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "çok fazla '%c' tuş kısayolu içeriyor" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "başlıkta `%s' başlık alanı yok\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "`%s' başlık alanı satırın başında olmalıydı\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "uyarı: PO dosya başlığı fuzzy\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "`domain %s' yönergesi yoksayıldı" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "ileti iki defa tanımlanmış" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...bu ilk tanımlamanın konumu" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "boş `msgstr' girdisi yoksayıldı" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "fuzzy `msgstr' girdisi yoksayıldı" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "'%c' seçeneği 'K' ya da 'T' belirtilmeden önce kullanılamaz" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1444,7 +1444,7 @@ msgstr "" "Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n" "bir çeviri kataloğunun tüm iletilerini çıkarır.\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1501,7 +1501,7 @@ msgstr "" " -f, --file=DOSYA KALIP, DOSYAdan sağlanır\n" " -i, --ignore-case harf büyüklükleri fark olarak algılanmaz\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1533,11 +1533,11 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "grep alt sürecine yazılamadı" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1547,7 +1547,7 @@ msgstr "" "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n" "Bu çevirinizi test edebilmeniz için gereklidir.\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1558,19 +1558,19 @@ msgstr "" "Lütfen --locale seçeneğinden bir yerel ya da\n" "--output-file seçeneğinden .po çıktı dosyası belirtin.\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "%s oluşturuldu.\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "Kullanıcının ortam değişkenlerindeki bilgilerle bir yeni PO dosyası oluşturur.\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1583,7 +1583,7 @@ msgstr "" "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n" "- verilmişse standart girdi okunur.\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1596,7 +1596,7 @@ msgstr "" "Çıktı dosyası verilmemişse, --locale seçeneği ya da kullanıcının yerel\n" "ayarları kullanılır, - verilmişse sonuçlar standart çıktıya yazılır.\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1613,7 +1613,7 @@ msgstr "" " --no-wrap sayfa genişliğine sığmayan satırların taşan\n" " kısmı bir alt satıra indirilmez\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1622,11 +1622,11 @@ msgstr "" "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile " "belirtin.\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "dizin okunurken hata" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1635,23 +1635,23 @@ msgstr "" "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile " "belirtin.\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() başarısız" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s alt süreci G/Ç hatası" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s alt süreci çıkış kodu %d ile başarısız" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1666,28 +1666,28 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "%s paketi için Türkçe çeviriler" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\"" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş." -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " @@ -1696,17 +1696,17 @@ msgstr "" "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n" "kümesi belirtilmemiş" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil." -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "uyarı: " -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" @@ -1714,7 +1714,7 @@ msgstr "" "Girdi dosyası UTF-8 ile karışık farklı kodlamalar içeriyor.\n" "Çıktı UTF-8'e dönüştürülüyor.\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1726,7 +1726,7 @@ msgstr "" "Çıktı UTF-8'e çevriliyor.\n" "--to-code seçeneğini kullanarak başka bir kodlama da seçebilirsiniz.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1739,12 +1739,12 @@ msgstr "" "'%s' çıktısı yanlış olabilir.\n" "Yapılabilecekler:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- LC_ALL değişkenini %s kodlamasını kullanan bir yerele ayarlayın.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1755,7 +1755,7 @@ msgstr "" " '%s' uyguladıktan sonra,\n" " 'msgconv' kullanarak tekrar %s a dönün.\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1768,7 +1768,7 @@ msgstr "" " '%s' uyguladıktan sonra,\n" " 'msgconv' kullanarak tekrar %s a dönün.\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1779,15 +1779,15 @@ msgstr "" "'%s' çıktısı yanlış olabilir.\n" "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "dönüşüm başarısız" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1796,7 +1796,7 @@ msgstr "" "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n" "ve iconv() bu dönüşümü desteklemiyor." -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1805,11 +1805,11 @@ msgstr "" "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n" "Bu sürüm iconv() olmaksızın kurgulanmış." -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "yedekleme türü" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1832,7 +1832,7 @@ msgstr "" "Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n" "belirsiz eşleşmeler kullanılmıştır.\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1849,7 +1849,7 @@ msgstr "" " -C, --compendium=DOSYA ileti çevirilerinin birden fazlasını içerebilen\n" " ek veritabanı\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1860,7 +1860,7 @@ msgstr "" " -U, --update def.po dosyasını günceller,\n" " def.po zaten güncelse bir şey yapmaz\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1890,7 +1890,7 @@ msgstr "" "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n" "belirtilmedikçe yedekleme dosyasının soneki `~' dir.\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1905,15 +1905,15 @@ msgstr "" " -v, --verbose sonuçlar daha ayrıntılı verilir\n" " -q, --quiet, --silent bilgi verilmez\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr ".bu ileti çoğul biçem olmalıydı" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "bu ileti çoğul biçem olmamalıydı" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1922,11 +1922,11 @@ msgstr "" "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık " "kullanılmayan ileti okundu.\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " bitti.\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ile diğer dosya isimleri bağdaşmıyor" @@ -2075,19 +2075,19 @@ msgstr "" " -u, --unique sadece tek iletiler gösterilir,\n" " tekrarlananlar iptal edilir\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Kullanımı: %s [SEÇENEK] [PAKET] MSGID MSGID-PLURAL SAYI\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "Bir sayıya bağlı olarak ilgili tekil/çoğul ileti çevirisini gösterir.\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2108,7 +2108,7 @@ msgstr "" " MSGID MSGID-PLURAL MSGID (tekil) / MSGID-PLURAL (çoğul) çevrilir\n" " SAYI SAYIya bağlı olarak tekil/çoğul iletilerden biri seçilir\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2122,17 +2122,17 @@ msgstr "" "TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n" "Standart arama dizini: %s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s: uyarı: " -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2141,15 +2141,15 @@ msgstr "" "\"%s\" karakter kümesi kabul görmüş bir isim değil.\n" "Kullanıcının karakter kümesine dönüşüm yapılamıyabilir.\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "Çözümleme hatalarına rağmen devam ediliyor." -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "Yine de devam ediliyor." -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2158,7 +2158,7 @@ msgstr "" "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n" "ve iconv() \"%s\" desteği vermiyor.\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -2166,12 +2166,12 @@ msgstr "" "GNU libiconv paketini kurduktan sonra GNU gettext paketini\n" "yeniden kurarak bu sorunun üstesinden gelmelisiniz.\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2180,7 +2180,7 @@ msgstr "" "\"%s\" karakter kümesi desteklenmiyor. %s iconv()ye bağlı.\n" "Bu sürüm iconv() olmaksızın kurgulanmış.\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2213,80 +2213,80 @@ msgid "plural form has wrong index" msgstr "çoğul biçemin indeksi hatalı" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "çoklu bayt dizisi geçersiz" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "dosya sonunda çoklu bayt dizisi tamamlanmadı" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv başarısızlığı" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "\"%s\" okunurken hata" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "anahtar-sözcük \"%s\" bilinmiyor" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "denetim dizisi geçersiz" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "dizge içinde dosya sonu" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "dizge içinde satır sonu" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:214 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, c-format msgid "file \"%s\" is truncated" msgstr "\"%s\" dosyası kırpılmış" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor" -#: src/read-mo.c:181 src/read-mo.c:289 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "\"%s\" dosyası bir GNU .mo dosyas değil" -#: src/read-mo.c:194 +#: src/read-mo.c:170 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" "\"%s\" dosyası %s. satırda NUL sonlandırmalı olmayan bir dizge içeriyor" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "iki argüman gerekiyor" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Kullanımı: %s [SEÇENEK] URL DOSYA\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2295,52 +2295,52 @@ msgstr "" "Bir URL'nin içeriğini alır ve çıktılar. URL erişilebilir değilse,\n" "yerel DOSYA dosya kullanılır.\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "standart çıktıya yazılırken hata" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "\"%s\" şablonu kullanılarak bir geçici dizin oluşturulamaz" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "Geçerli bir Java sınıfı ismi değil: %s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "\"%s\" oluşturulamadı" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" dosyasına yazarken hata" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n" "$JAVAC ortam değişkenine uygun değeri atayın." -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "\"%s\" yazılmak için açılırken hata" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2353,64 +2353,64 @@ msgstr "" "olabilir. Salt ASCII msgid kullanmanız önerilir.\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "\"%s\" çıktı dosyası oluşturulamıyor" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "standart çıktı" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti" -#: src/x-po.c:106 src/xgettext.c:651 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "bu dosya paket yönergelerini içermeyebilir" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: dizge ataması geçersiz" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: # dan sonra sayı yok" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: dizge ifade geçersiz" -#: src/xgettext.c:404 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "standart çıktıya yazılırken --join-existing kullanılamaz" -#: src/xgettext.c:409 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext anahtar sözcükler olmaksızın bulamaz" -#: src/xgettext.c:505 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek" -#: src/xgettext.c:550 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2419,7 +2419,7 @@ msgstr "" "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n" "Benzer durum seçimlik argümanlar içinde geçerlidir.\n" -#: src/xgettext.c:570 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2435,14 +2435,14 @@ msgstr "" " -p, --output-dir=DÄ°ZÄ°N çıktı dosyaları DÄ°ZÄ°Ne konulacaktır.\n" "Çıktı dosyası olarak - verilmişse çıktı standart çıktıya yazılır.\n" -#: src/xgettext.c:579 +#: src/xgettext.c:632 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" PHP, RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2453,7 +2453,16 @@ msgstr "" " -C, --c++ --language=C++ için kısaltma\n" "Dil öntanımlı olarak girdi dosyasının uzantısına göre seçilir.\n" -#: src/xgettext.c:590 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2467,7 +2476,7 @@ msgstr "" " -x, --exclude-file=DOSYA.po DOSYA.po dosyasındaki iletiler çıkartılmaz\n" " -c, --add-comments[=ETÄ°TET] ETÄ°KETli yorum bloğunu çıktı dosyasına yazar\n" -#: src/xgettext.c:599 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2486,7 +2495,7 @@ msgstr "" " --debug biçem dizgesi tanıması ile ilgili daha fazla\n" " ayrıntı verilir.\n" -#: src/xgettext.c:609 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2531,11 +2540,18 @@ msgstr "" " -M, --msgstr-suffix[=DÄ°ZGE] msgstr girdileri için sonek olarak DÄ°ZGE ya da\n" " \"\" kullanılır\n" -#: src/xgettext.c:831 +#: src/xgettext.c:879 msgid "standard input" msgstr "standart girdi" -#: src/xgettext.c:946 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2545,7 +2561,7 @@ msgstr "" "gettext(\"\") ile başlık girdilerindeki bilgileri\n" "döndürür. Boş dizge değildir.\n" -#: src/xgettext.c:1303 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "dil `%s' bilinmiyor" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index c88237805..fcc24ff88 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index f1e50266f..a72e8e584 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.3\n" -"POT-Creation-Date: 2002-07-23 15:23+0200\n" +"POT-Creation-Date: 2003-01-08 14:39+0100\n" "PO-Revision-Date: 2002-07-21 06:45 +0800\n" "Last-Translator: Pofeng Lee \n" "Language-Team: Chinese (traditional) \n" @@ -16,195 +16,195 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:120 #, c-format msgid "invalid argument `%s' for `%s'" msgstr "¡¥%2$s¡¦ªº°Ñ¼Æ¡¥%1$s¡¦µL®Ä" -#: lib/argmatch.c:135 +#: lib/argmatch.c:121 #, c-format msgid "ambiguous argument `%s' for `%s'" msgstr "¡¥%2$s¡¦ªº°Ñ¼Æ¡¥%1$s¡¦¬O¤£©ú½Tªº" -#: lib/argmatch.c:155 +#: lib/argmatch.c:139 msgid "Valid arguments are:" msgstr "¦³®Äªº°Ñ¼Æ¬°¡G" # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format -#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:728 src/read-mo.c:263 -#: src/urlget.c:204 src/xgettext.c:837 src/xgettext.c:850 src/xgettext.c:860 +#: lib/copy-file.c:63 src/file-list.c:56 src/po-lex.c:652 src/read-mo.c:241 +#: src/urlget.c:195 src/xgettext.c:888 src/xgettext.c:901 src/xgettext.c:911 #, c-format msgid "error while opening \"%s\" for reading" msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³ÆŪ¨ú®Éµo¥Í¿ù»~" -#: lib/copy-file.c:68 +#: lib/copy-file.c:70 #, c-format msgid "cannot open backup file \"%s\" for writing" msgstr "µLªk¼g¤J³Æ¥÷ÀÉ¡§%s¡¨" -#: lib/copy-file.c:81 src/urlget.c:216 +#: lib/copy-file.c:83 src/urlget.c:207 #, c-format msgid "error reading \"%s\"" msgstr "Ū¨ú¡§%s¡¨®Éµo¥Í¿ù»~" -#: lib/copy-file.c:87 lib/copy-file.c:91 +#: lib/copy-file.c:89 lib/copy-file.c:93 #, c-format msgid "error writing \"%s\"" msgstr "¼g¤J¡§%s¡¨®Éµo¥Í¿ù»~" -#: lib/copy-file.c:93 src/urlget.c:226 +#: lib/copy-file.c:95 src/urlget.c:217 #, c-format msgid "error after reading \"%s\"" msgstr "§¹¦¨Åª¨ú¡§%s¡¨«áµo¥Í¿ù»~" -#: lib/error.c:116 +#: lib/error.c:112 msgid "Unknown system error" msgstr "¤£©úªº¨t²Î¿ù»~" -#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188 -#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204 -#: lib/wait-process.c:132 +#: lib/execute.c:150 lib/execute.c:185 lib/pipe-bidi.c:143 lib/pipe-bidi.c:178 +#: lib/pipe-in.c:150 lib/pipe-in.c:186 lib/pipe-out.c:150 lib/pipe-out.c:186 +#: lib/wait-process.c:129 #, c-format msgid "%s subprocess failed" msgstr "%s °Æµ{§Çµo¥Í¿ù»~" -#: lib/getopt.c:691 +#: lib/getopt.c:689 lib/getopt.c:701 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s¡G¿ï¶µ¡¥%s¡¦¬O¤£©ú½Tªº\n" -#: lib/getopt.c:716 +#: lib/getopt.c:734 lib/getopt.c:738 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s¡G¿ï¶µ¡¥--%s¡¦¤£¤¹³\¦³°Ñ¼Æ\n" -#: lib/getopt.c:721 +#: lib/getopt.c:747 lib/getopt.c:752 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s¡G¿ï¶µ¡¥%c%s¡¦¤£¤¹³\¦³°Ñ¼Æ\n" -#: lib/getopt.c:739 lib/getopt.c:912 +#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s¡G¿ï¶µ¡¥%s¡¦»Ý­n°Ñ¼Æ\n" -#: lib/getopt.c:768 +#: lib/getopt.c:839 lib/getopt.c:842 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s¡GµLªkÃѧO¿ï¶µ¡¥--%s¡¦\n" -#: lib/getopt.c:772 +#: lib/getopt.c:850 lib/getopt.c:853 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s¡GµLªkÃѧO¿ï¶µ¡¥%c%s¡¦\n" -#: lib/getopt.c:798 +#: lib/getopt.c:900 lib/getopt.c:903 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s¡G¤£¦Xªkªº¿ï¶µ ¢w %c\n" -#: lib/getopt.c:801 +#: lib/getopt.c:909 lib/getopt.c:912 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s¡G¿ï¶µµL®Ä ¢w %c\n" -#: lib/getopt.c:831 lib/getopt.c:961 +#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s¡G¿ï¶µ»Ý­n°Ñ¼Æ ¢w %c\n" -#: lib/getopt.c:878 +#: lib/getopt.c:1022 lib/getopt.c:1033 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s¡G¿ï¶µ¡¥-W %s¡¦¬O¤£©ú½Tªº\n" -#: lib/getopt.c:896 +#: lib/getopt.c:1057 lib/getopt.c:1069 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s¡G¿ï¶µ¡¥-W %s¡¦¤£¤¹³\¦³°Ñ¼Æ\n" -#: lib/javacomp.c:462 +#: lib/javacomp.c:458 msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "§ä¤£¨ì Java ½sĶ¾¹¡A½Ð¦w¸Ë gcj ©Î¬O³]©w $JAVAC Àô¹ÒÅܼÆ" -#: lib/javaexec.c:414 +#: lib/javaexec.c:406 msgid "Java virtual machine not found, try installing gij or set $JAVA" msgstr "§ä¤£¨ì Java virtual machine¡A½Ð¦w¸Ë gij ©Î¬O³]©w $JAVA Àô¹ÒÅܼÆ" -#: lib/obstack.c:474 lib/xerror.c:53 lib/xmalloc.c:53 src/po-lex.c:97 -#: src/po-lex.c:130 +#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:47 +#: src/po-lex.c:88 src/po-lex.c:117 msgid "memory exhausted" msgstr "°O¾ÐÅé¯ÓºÉ" -#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135 -#: lib/pipe-out.c:135 +#: lib/pipe-bidi.c:106 lib/pipe-bidi.c:108 lib/pipe-in.c:117 +#: lib/pipe-out.c:117 msgid "cannot create pipe" msgstr "µLªk«Ø¥ßºÞ½u" -#: lib/wait-process.c:110 +#: lib/wait-process.c:107 #, c-format msgid "%s subprocess" msgstr "%s °Æµ{§Ç" -#: lib/wait-process.c:124 +#: lib/wait-process.c:121 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "%s °Æµ{§Ç¥X²{ÄY­«¿ù»~ªº°T¸¹ %d" -#: src/format-c.c:760 src/format-python.c:506 +#: src/format-c.c:738 src/format-python.c:484 #, c-format msgid "number of format specifications in 'msgid' and '%s' does not match" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ¼Æ¥Ø¨Ã¤£²Å¦X" -#: src/format-c.c:774 src/format-elisp.c:389 src/format-librep.c:353 -#: src/format-pascal.c:443 src/format-python.c:520 +#: src/format-c.c:752 src/format-elisp.c:367 src/format-librep.c:331 +#: src/format-pascal.c:421 src/format-python.c:498 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument %u are not the same" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº²Ä %u ­Ó°Ñ¼Æªº³W®æ¨Ã¤£¬Û¦P" -#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403 -#: src/format-ycp.c:145 +#: src/format-elisp.c:327 src/format-librep.c:291 src/format-pascal.c:381 +#: src/format-ycp.c:126 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'" msgstr "¡¥%2$s¡¦¤¤²Ä %1$u ­Ó°Ñ¼Æªº³W®æ¦b¡¥msgid¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418 -#: src/format-ycp.c:144 +#: src/format-elisp.c:342 src/format-librep.c:306 src/format-pascal.c:396 +#: src/format-ycp.c:125 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "²Ä %u ­Ó°Ñ¼Æªº³W®æ¦b¡¥%s¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-java.c:660 +#: src/format-java.c:632 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in " "'msgid'" msgstr "¡¥%2$s¡¦¤¤ªº°Ñ¼Æ {%1$u} ªº®æ¦¡¦b¡¥msgid¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-java.c:675 +#: src/format-java.c:647 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "°Ñ¼Æ {%u} ªº³W®æ¦b¡¥%s¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-java.c:700 +#: src/format-java.c:672 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument {%u} are not the same" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ {%u} ªº³W®æ¨Ã¤£¬Û¦P" -#: src/format-lisp.c:3381 +#: src/format-lisp.c:3212 #, c-format msgid "format specifications in 'msgid' and '%s' are not equivalent" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ³W®æ¨Ã«D¦Pµ¥" -#: src/format-lisp.c:3402 +#: src/format-lisp.c:3233 #, c-format msgid "format specifications in '%s' are not a subset of those in 'msgid'" msgstr "¡¥%s¡¦ªº°Ñ¼Æ³W®æ¨Ã«D¡¥msgid¡¦ªº°Ñ¼Æ³W®æªº¤@³¡¥÷" -#: src/format-python.c:397 +#: src/format-python.c:375 #, c-format msgid "" "format specifications in 'msgid' expect a mapping, those in '%s' expect a " @@ -213,7 +213,7 @@ msgstr "" "¦b 'msgid' ¸Ì­±ªº¦r¦ê®æ¦¡©w¸q¹ïÀ³ªº¬O¤@­ÓÂø´êªí(mapping)¡A¦Ó¦b '%s' ¸Ì­±ªº¹ï" "À³ªº«o¬O¤@­Ó©T©w¦³§Ç¦C (tuple)" -#: src/format-python.c:409 +#: src/format-python.c:387 #, c-format msgid "" "format specifications in 'msgid' expect a tuple, those in '%s' expect a " @@ -222,29 +222,29 @@ msgstr "" "¦b 'msgid' ¸Ì­±ªº¦r¦ê®æ¦¡©w¸q¹ïÀ³ªº¬O¤@­Ó©T©w¦³§Ç¦C(tuple)¡A¦Ó¦b '%s' ¸Ì­±ªº" "¹ïÀ³ªº«o¬O¤@­ÓÂø´êªí (mapping)" -#: src/format-python.c:437 +#: src/format-python.c:415 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in " "'msgid'" msgstr "¡¥%2$s¡¦¤¤ªº°Ñ¼Æ¡¥%1$s¡¦ªº®æ¦¡¦b¡¥msgid¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-python.c:452 +#: src/format-python.c:430 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "°Ñ¼Æ¡¥%s¡¦ªº³W®æ¦b¡¥%s¡¦¤¤¨Ã¤£¦s¦b" -#: src/format-python.c:478 +#: src/format-python.c:456 #, c-format msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ¡¥%s¡¦ªº®æ¦¡¨Ã¤£¬Û¦P" -#: src/gettext.c:135 src/hostname.c:175 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 -#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 +#: src/gettext.c:132 src/hostname.c:171 src/msgattrib.c:267 src/msgcat.c:235 +#: src/msgcmp.c:125 src/msgcomm.c:234 src/msgconv.c:189 src/msgen.c:177 +#: src/msgexec.c:159 src/msgfilter.c:238 src/msgfmt.c:321 src/msggrep.c:285 +#: src/msginit.c:230 src/msgmerge.c:260 src/msgunfmt.c:205 src/msguniq.c:213 +#: src/ngettext.c:123 src/urlget.c:128 src/xgettext.c:397 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,33 +255,33 @@ msgstr "" "³o¬O¦Û¥Ñ³nÅé¡F½Ð°Ñ¦Ò­ì©l½Xªºª©ÅvÁn©ú¡C¥»³nÅ餣´£¨Ñ¥ô¦ó«OÃÒ¡A¬Æ¦Ü¤£·|¥]¬A\n" "¥i°â©Ê©M¾A¥Î©ó¥ô¦ó¯S©w¥Øªºªº«OÃÒ¡C\n" -#: src/gettext.c:140 src/hostname.c:180 src/msgattrib.c:274 src/msgcat.c:239 -#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 -#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 -#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 +#: src/gettext.c:137 src/hostname.c:176 src/msgattrib.c:272 src/msgcat.c:240 +#: src/msgcmp.c:130 src/msgcomm.c:239 src/msgconv.c:194 src/msgen.c:182 +#: src/msgexec.c:164 src/msgfilter.c:243 src/msgfmt.c:326 src/msggrep.c:290 +#: src/msginit.c:235 src/msgmerge.c:265 src/msgunfmt.c:210 src/msguniq.c:218 +#: src/ngettext.c:128 src/urlget.c:133 src/xgettext.c:402 #, c-format msgid "Written by %s.\n" msgstr "¥Ñ %s ½s¼g¡C\n" -#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143 +#: src/gettext.c:155 src/hostname.c:186 src/msginit.c:245 src/ngettext.c:140 msgid "too many arguments" msgstr "°Ñ¼Æ¹L¦h" -#: src/gettext.c:168 src/ngettext.c:155 +#: src/gettext.c:165 src/ngettext.c:152 msgid "missing arguments" msgstr "¯Ê¤Ö¤F°Ñ¼Æ" -#: src/gettext.c:240 src/hostname.c:204 src/msgattrib.c:327 src/msgcat.c:295 -#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:248 src/msgen.c:232 -#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 -#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:537 +#: src/gettext.c:236 src/hostname.c:199 src/msgattrib.c:324 src/msgcat.c:295 +#: src/msgcmp.c:161 src/msgcomm.c:307 src/msgconv.c:248 src/msgen.c:232 +#: src/msgexec.c:216 src/msgfilter.c:335 src/msgfmt.c:497 src/msggrep.c:394 +#: src/msginit.c:320 src/msgmerge.c:377 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:206 src/urlget.c:156 src/xgettext.c:593 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¸Õ¸Õ¡¥%s --help¡¦¨ÓÀò¨ú§ó¦h¸ê°T¡C\n" -#: src/gettext.c:245 +#: src/gettext.c:241 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -290,12 +290,12 @@ msgstr "" "¥Îªk¡G%s [¿ï¶µ] [[¤å¦r»â°ì] MSGID]\n" "©Î¡G %s [¿ï¶µ] -s [MSGID]...\n" -#: src/gettext.c:251 +#: src/gettext.c:247 #, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Åã¥Ü¬Y¤å¦r°T®§ªº¥»¦a»y¨¥Â½Ä¶¡C\n" -#: src/gettext.c:255 +#: src/gettext.c:251 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n" @@ -315,7 +315,7 @@ msgstr "" " -V, --version Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n" " [¤å¦r»â°ì] MSGID ¥Ñ<¤å¦r»â°ì>Ū¨ú¬ÛÀ³©ó MSGID ªºÂ½Ä¶°T®§\n" -#: src/gettext.c:266 +#: src/gettext.c:262 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -334,25 +334,25 @@ msgstr "" "¦Ó¬O´M§ä°T®§¸ê®ÆÀɸ̽Ķ¹Lªº°T®§¡C\n" "¼Ð·Çªº·j´M¥Ø¿ý¬°¡G%s\n" -#: src/gettext.c:277 src/hostname.c:234 src/msgattrib.c:409 src/msgcat.c:378 -#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:314 src/msgen.c:294 -#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 -#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:634 +#: src/gettext.c:273 src/hostname.c:229 src/msgattrib.c:406 src/msgcat.c:378 +#: src/msgcmp.c:206 src/msgcomm.c:387 src/msgconv.c:314 src/msgen.c:294 +#: src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:591 src/msggrep.c:484 +#: src/msginit.c:373 src/msgmerge.c:477 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:240 src/urlget.c:178 src/xgettext.c:698 msgid "Report bugs to .\n" msgstr "½Ð¦^³ø¿ù»~¦Ü ¡C\n" -#: src/hostname.c:209 src/msginit.c:352 +#: src/hostname.c:204 src/msginit.c:325 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "¥Îªk¡G%s [¿ï¶µ]\n" -#: src/hostname.c:214 +#: src/hostname.c:209 #, no-wrap msgid "Print the machine's hostname.\n" msgstr "¦C¦L¥D¾÷ªº¦WºÙ¡C\n" -#: src/hostname.c:219 +#: src/hostname.c:214 #, no-wrap msgid "" "Output format:\n" @@ -366,9 +366,9 @@ msgstr "" " -f, --fqdn, --long ªøªº¥D¾÷¦WºÙ¡A¥]¬A¥¿¦¡ªººô°ì¦WºÙ¡]FQDN¡^¤Î§O¦W\n" " -i, --ip-address ¥D¾÷ªº IP ¦a§}\n" -#: src/hostname.c:228 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:308 -#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 -#: src/msginit.c:394 src/urlget.c:180 +#: src/hostname.c:223 src/msgattrib.c:400 src/msgcmp.c:200 src/msgconv.c:308 +#: src/msgen.c:288 src/msgexec.c:254 src/msgfilter.c:404 src/msggrep.c:478 +#: src/msginit.c:367 src/urlget.c:172 #, no-wrap msgid "" "Informative output:\n" @@ -379,47 +379,47 @@ msgstr "" " -h, --help Åã¥Ü¦¹¬q»¡©ú¨ÃÂ÷¶}\n" " -V, --version Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n" -#: src/hostname.c:249 src/hostname.c:256 +#: src/hostname.c:244 src/hostname.c:251 msgid "could not get host name" msgstr "µLªk¨ú±o¥D¾÷¦WºÙ" -#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 -#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 +#: src/msgattrib.c:287 src/msgconv.c:209 src/msgexec.c:139 src/msgfilter.c:184 +#: src/msggrep.c:305 src/msginit.c:184 src/msguniq.c:233 msgid "at most one input file allowed" msgstr "³Ì¦h¥u¤¹³\¤@­Ó¿é¤JÀÉ" -#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 -#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 -#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 -#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 -#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 -#: src/xgettext.c:397 +#: src/msgattrib.c:293 src/msgattrib.c:297 src/msgcat.c:250 src/msgcat.c:254 +#: src/msgcomm.c:249 src/msgcomm.c:253 src/msgconv.c:215 src/msgconv.c:219 +#: src/msgen.c:204 src/msgen.c:208 src/msgfilter.c:258 src/msgfilter.c:262 +#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:311 +#: src/msggrep.c:315 src/msgmerge.c:290 src/msgmerge.c:311 src/msgmerge.c:315 +#: src/msgunfmt.c:220 src/msguniq.c:239 src/msguniq.c:243 src/xgettext.c:412 +#: src/xgettext.c:416 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ©M %s ¨âªÌ¬O¤¬¤£¬Û®eªº" -#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279 +#: src/msgattrib.c:329 src/msgconv.c:253 src/msggrep.c:399 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]\n" -#: src/msgattrib.c:337 +#: src/msgattrib.c:334 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "®Ú¾Ú°T®§ªºÄݩʹLÂo½ĶÀɸ̪ºÂ½Ä¶±ø¥Ø¡A¨Ã³B²z°T®§ªºÄÝ©Ê¡C\n" -#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 -#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 -#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgattrib.c:340 src/msgcat.c:318 src/msgcmp.c:181 src/msgcomm.c:329 +#: src/msgconv.c:263 src/msgen.c:250 src/msgexec.c:241 src/msgfilter.c:350 +#: src/msgfmt.c:512 src/msggrep.c:410 src/msginit.c:336 src/msgmerge.c:400 #: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "ªø¿ï¶µ¥²¶·¥Îªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²¶·ªº¡C\n" -#: src/msgattrib.c:348 src/msgconv.c:268 src/msggrep.c:423 src/msguniq.c:301 +#: src/msgattrib.c:345 src/msgconv.c:268 src/msggrep.c:415 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -432,8 +432,8 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¨S¦³«ü©w¿é¤JÀɩοé¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgattrib.c:356 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:379 -#: src/msggrep.c:431 src/msgmerge.c:430 +#: src/msgattrib.c:353 src/msgconv.c:276 src/msgen.c:263 src/msgfilter.c:363 +#: src/msggrep.c:423 src/msgmerge.c:422 #, no-wrap msgid "" "Output file location:\n" @@ -445,7 +445,7 @@ msgstr "" " -o, --output-file=¿é¥XÀÉ ±N¿é¥Xµ²ªG¼g¦Ü<¿é¥XÀÉ>\n" "¦pªG¨S¦³«ü©w<¿é¥XÀÉ>©Î<¿é¥XÀÉ>¬O¡¥-¡¦¡A«h·|±Nµ²ªG¼g¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msgattrib.c:364 +#: src/msgattrib.c:361 #, no-wrap msgid "" "Message selection:\n" @@ -464,7 +464,7 @@ msgstr "" " --no-obsolete ²¾°£¹L®É #~ ªº°T®§\n" " --only-obsolete «O¯d¹L®É #~ ªº°T®§\n" -#: src/msgattrib.c:375 +#: src/msgattrib.c:372 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -483,7 +483,7 @@ msgstr "" " --fuzzy µ¥©ó --only-fuzzy --clear-fuzzy\n" " --obsolete µ¥©ó --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:386 +#: src/msgattrib.c:383 #, no-wrap msgid "" "Output details:\n" @@ -514,12 +514,12 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgcat.c:259 src/msgcomm.c:282 +#: src/msgcat.c:260 src/msgcomm.c:279 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "¤£¥i¯à¥X²{ªº¿ï¾Ü±ø¥ó (%d < n <%d)" -#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:542 +#: src/msgcat.c:300 src/msgcomm.c:312 src/xgettext.c:598 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]...\n" @@ -545,7 +545,7 @@ msgstr "" "--use-first ¿ï¶µ¡A¨º¼Ë«h·|¥Ñ²Ä¤@­Ó§t¦³¸Ó½Ķ±ø¥ØªºÀɮרú±o¸ê®Æ¡C\n" "©Ò¦³ PO Àɤ¤ªºÂ½Ä¶±ø¥ØªºÀɮצì¸m³£·|²Ö¿n¤U¨Ó¡C\n" -#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558 +#: src/msgcat.c:323 src/msgcomm.c:334 src/xgettext.c:614 #, no-wrap msgid "" "Input file location:\n" @@ -560,7 +560,7 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 +#: src/msgcat.c:332 src/msgcomm.c:343 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -628,7 +628,7 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:628 +#: src/msgcat.c:372 src/msgcomm.c:381 src/msguniq.c:344 src/xgettext.c:692 #, no-wrap msgid "" "Informative output:\n" @@ -639,20 +639,20 @@ msgstr "" " -h, --help Åã¥Ü¦¹¬q»¡©ú¨ÃÂ÷¶}\n" " -V, --version Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n" -#: src/msgcmp.c:149 src/msgmerge.c:286 +#: src/msgcmp.c:141 src/msgmerge.c:276 msgid "no input files given" msgstr "¥¼«ü©w¿é¤JÀÉ" -#: src/msgcmp.c:154 src/msgmerge.c:291 +#: src/msgcmp.c:146 src/msgmerge.c:281 msgid "exactly 2 input files required" msgstr "»Ý­n«ê¦n«ü©w¨â­Ó¿é¤JÀÉ" -#: src/msgcmp.c:175 src/msgmerge.c:390 +#: src/msgcmp.c:166 src/msgmerge.c:382 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "¥Îªk¡G%s [¿ï¶µ] def.po ref.pot\n" -#: src/msgcmp.c:180 +#: src/msgcmp.c:171 #, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -668,7 +668,7 @@ msgstr "" "¦¹µ{¦¡¥i¥Î¨ÓÀˬdµ{¦¡¤¤ªº©Ò¦³ªº°T®§¬O§_³£¤w¸g½Ķ¦n¤F¡C¤ñ¸û®É¦pªG\n" "¦³¤£§¹¥þ°t¦Xªº¦r¦ê¥X²{¡Aµ{¦¡·|¥H¼Ò½k°t¹ïªº¤è¦¡±o¥X¸û¦nªºµ²ªG¡C\n" -#: src/msgcmp.c:195 +#: src/msgcmp.c:186 #, no-wrap msgid "" "Input file location:\n" @@ -681,7 +681,7 @@ msgstr "" " ref.pot ½Ķ¨Ó·½ÀÉ\n" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" -#: src/msgcmp.c:203 src/msgmerge.c:454 +#: src/msgcmp.c:194 src/msgmerge.c:446 #, no-wrap msgid "" "Operation modifiers:\n" @@ -690,42 +690,34 @@ msgstr "" "¾Þ§@¼Ò¦¡¡G\n" " -m, --multi-domain ±N ref.pot ®M¥Î©ó def.po ¤¤ªº¨C¤@­Ó»â°ì\n" -#: src/msgcmp.c:252 src/msgmerge.c:855 +#: src/msgcmp.c:265 src/msgmerge.c:837 msgid "this message is used but not defined..." msgstr "³o­Ó°T®§¦³¨Ï¥Î¹L¦ý¨S¦³©w¸q..." -#: src/msgcmp.c:254 src/msgmerge.c:857 +#: src/msgcmp.c:267 src/msgmerge.c:839 msgid "...but this definition is similar" msgstr "...¦ý³o­Ó©w¸q«Ü¬Û¦ü" -#: src/msgcmp.c:259 src/msgmerge.c:884 +#: src/msgcmp.c:272 src/msgmerge.c:866 #, c-format msgid "this message is used but not defined in %s" msgstr "³o­Ó°T®§¦³¨Ï¥Î¹L¦ý¦b %s ¤¤¨S¦³©w¸q" -#: src/msgcmp.c:331 +#: src/msgcmp.c:376 msgid "warning: this message is not used" msgstr "ĵ§i¡G¨S¦³¨Ï¥Î³o­Ó°T®§" -#: src/msgcmp.c:338 src/po-lex.c:701 +#: src/msgcmp.c:383 src/po-lex.c:626 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "§ä¨ì %d ­ÓÄY­«¿ù»~" -#: src/msgcmp.c:419 src/msgfmt.c:1449 src/read-po.c:202 src/x-po.c:163 -msgid "duplicate message definition" -msgstr "­«½Æªº°T®§©w¸q" - -#: src/msgcmp.c:420 src/msgfmt.c:1450 src/read-po.c:203 src/x-po.c:164 -msgid "...this is the location of the first definition" -msgstr "...³o¬O²Ä¤@¦¸©w¸qªº¦ì¸m" - -#: src/msgcomm.c:271 +#: src/msgcomm.c:268 msgid "at least two files must be specified" msgstr "¥²¶·«ü©w¦Ü¤Ö¨â­ÓÀÉ®×" -#: src/msgcomm.c:321 +#: src/msgcomm.c:317 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -743,7 +735,7 @@ msgstr "" "°T®§¡^¡C½Ķ¤º®e¡B¦Û¦æ¥[¤Wªºµù¸Ñ©M­ìµ{¦¡½Xªºµù¸Ñ³£·|«O¯d¡A¦ý¥u·|¥Ñ²Ä¤@­Ó\n" "§t¦³¸Ó½Ķ±ø¥ØªºÀɮרú±o¡C©Ò¦³ PO Àɤ¤ªºÂ½Ä¶±ø¥ØªºÀɮצì¸m³£·|²Ö¿n¤U¨Ó¡C\n" -#: src/msgcomm.c:355 +#: src/msgcomm.c:351 #, no-wrap msgid "" "Message selection:\n" @@ -762,7 +754,7 @@ msgstr "" " -u, --unique --less-than=2 ªºÁY¼g¡A­n¨D¥u¦L¥X¥X²{¤@¦¸\n" " ªº°T®§\n" -#: src/msgcomm.c:367 +#: src/msgcomm.c:363 #, no-wrap msgid "" "Output details:\n" @@ -810,7 +802,7 @@ msgstr "" " -t, --to-code=¦WºÙ ¿é¥Xªº½s½X\n" "¹w³]ªº½s½X¬°¥Ø«e»y¨tªº½s½X¡C\n" -#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460 +#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:452 #, no-wrap msgid "" "Output details:\n" @@ -840,11 +832,11 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 +#: src/msgen.c:193 src/msgfmt.c:337 src/xgettext.c:433 msgid "no input file given" msgstr "¥¼«ü©w¿é¤JÀÉ" -#: src/msgen.c:197 +#: src/msgen.c:198 msgid "exactly one input file required" msgstr "»Ý­n«ê¦n«ü©w¤@­Ó¿é¤JÀÉ" @@ -877,16 +869,16 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgexec.c:180 +#: src/msgexec.c:174 msgid "missing command name" msgstr "¯Ê¤Ö¤F«ü¥O¦WºÙ" -#: src/msgexec.c:228 +#: src/msgexec.c:221 #, c-format, no-wrap msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "¥Îªk¡G%s [¿ï¶µ] «ü¥O [«ü¥O¿ï¶µ]\n" -#: src/msgexec.c:233 +#: src/msgexec.c:226 #, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -901,7 +893,7 @@ msgstr "" "§Y¬O msgexec ªº¿é¥Xµ²ªG¡Cmsgexec ªº¦^¶Ç­È¬O©Ò¦³\n" "«ü¥O°õ¦æªº¦^¶Ç­Èªº³Ì¤j­È¡C\n" -#: src/msgexec.c:242 +#: src/msgexec.c:235 #, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -910,7 +902,7 @@ msgstr "" "¦³¤@­ÓºÙ¬° '0' ªº¯S®í¤º¸m«ü¥O¡A¥¦·|¿é¥X©Ò¦³Â½Ä¶±ø¥Ø¡A¨ÃÀH«á¥[¤W null ¦ì¤¸¡C\n" "¡§msgexec 0¡¨ªº¿é¥X¾A¥Î©ó§@¬°¡§xargs -0¡¨ªº¿é¤J¡C\n" -#: src/msgexec.c:253 src/msgfilter.c:371 +#: src/msgexec.c:246 src/msgfilter.c:355 #, no-wrap msgid "" "Input file location:\n" @@ -923,34 +915,34 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¨S¦³«ü©w<¿é¤JÀÉ>©ÎªÌ<¿é¤JÀÉ>¬O¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgexec.c:313 +#: src/msgexec.c:299 msgid "write to stdout failed" msgstr "¼g¤J¦Ü¼Ð·Ç¿é¥X®Éµo¥Í¿ù»~" -#: src/msgexec.c:337 src/msgfilter.c:610 +#: src/msgexec.c:322 src/msgfilter.c:579 #, c-format msgid "write to %s subprocess failed" msgstr "¼g¤J¦Ü %s °Æµ{§Ç®Éµo¥Í¿ù»~" -#: src/msgfilter.c:268 +#: src/msgfilter.c:253 msgid "missing filter name" msgstr "¥¼«ü©w¹LÂo¾¹" -#: src/msgfilter.c:292 +#: src/msgfilter.c:277 msgid "at least one sed script must be specified" msgstr "¥²¶·«ü©w¦Ü¤Ö¤@­Ó sed script" -#: src/msgfilter.c:356 +#: src/msgfilter.c:340 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "¥Îªk¡G%s [¿ï¶µ] ¹LÂo¾¹ [¹LÂo¾¹¿ï¶µ]\n" -#: src/msgfilter.c:361 +#: src/msgfilter.c:345 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "¹ï©ó½ĶÀɤ¤ªº©Ò¦³Â½Ä¶±ø¥Ø¶i¦æ¹LÂo¡C\n" -#: src/msgfilter.c:387 +#: src/msgfilter.c:371 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -959,7 +951,7 @@ msgstr "" "<¹LÂo¾¹>¥i¥H¬O¥ô¦ó¥Ñ¼Ð·Ç¿é¤JŪ¤J½Ķ±ø¥Ø\n" "¨Ã±N­×§ï«áªºÂ½Ä¶¼g¶i¼Ð·Ç¿é¥Xªºµ{¦¡¡C\n" -#: src/msgfilter.c:393 +#: src/msgfilter.c:377 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -974,7 +966,7 @@ msgstr "" " -n, --quiet, --silent ¸T¤î¦Û°Ê¦L¥XªÅ¥Õ (pattern space)\n" # esrc/msgfilter.c:402 -#: src/msgfilter.c:402 +#: src/msgfilter.c:386 #, no-wrap msgid "" "Output details:\n" @@ -1006,81 +998,81 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgfilter.c:562 +#: src/msgfilter.c:531 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "µLªk©M %s °Æµ{§Ç«Ø¥ß«D±M¥Îªº I/O" -#: src/msgfilter.c:590 +#: src/msgfilter.c:559 #, c-format msgid "communication with %s subprocess failed" msgstr "©M %s °Æµ{§Ç·¾³q®É¥X²{¿ù»~" -#: src/msgfilter.c:641 +#: src/msgfilter.c:610 #, c-format msgid "read from %s subprocess failed" msgstr "¥Ñ %s °Æµ{§ÇŪ¤J¸ê®Æ®É¥X²{¿ù»~" -#: src/msgfilter.c:657 +#: src/msgfilter.c:626 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s °Æµ{§Ç¤w²×¤î¡A¿ù»~½X¬° %d" -#: src/msgfmt.c:318 +#: src/msgfmt.c:288 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "%s ªº°Ñ¼ÆÀ³¸Ó¬O¤@­Ó¼ÐÂI²Å¸¹" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 +#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:249 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s »Ý­n«ü©w¡§-d ¥Ø¿ý¡¨¿ï¶µ" -#: src/msgfmt.c:400 src/msgunfmt.c:241 +#: src/msgfmt.c:370 src/msgunfmt.c:242 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s »Ý­n«ü©w¡§-l locale¡¨¿ï¶µ" -#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 -#: src/msgunfmt.c:263 +#: src/msgfmt.c:386 src/msgmerge.c:298 src/msgmerge.c:304 src/msgunfmt.c:258 +#: src/msgunfmt.c:264 #, c-format msgid "%s is only valid with %s" msgstr "%s ¥u¯à©M %s °t¦X¤@°_¨Ï¥Î¤~¦³®Ä" -#: src/msgfmt.c:422 src/msgfmt.c:428 +#: src/msgfmt.c:392 src/msgfmt.c:398 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s ¥u¯à°t¦X %s ©Î %s ¤@°_¨Ï¥Î¤~¦³®Ä" -#: src/msgfmt.c:501 +#: src/msgfmt.c:471 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d ­Ó¤w½Ķªº°T®§" -#: src/msgfmt.c:506 +#: src/msgfmt.c:476 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] "¡A%d ­Ó¼Ò½k½Ķ°T®§" -#: src/msgfmt.c:511 +#: src/msgfmt.c:481 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] "¡A%d ­Ó¥¼Â½Ä¶ªº°T®§" -#: src/msgfmt.c:533 +#: src/msgfmt.c:502 #, c-format, no-wrap msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "¥Îªk¡G%s [¿ï¶µ] filename.po ...\n" -#: src/msgfmt.c:538 +#: src/msgfmt.c:507 #, no-wrap msgid "Generate binary message catalog from textual translation description.\n" msgstr "¥Ñ¤å¦r¼Ò¦¡Â½Ä¶Àɲ£¥Í¤G¤¸½X½ĶÀÉ¡C\n" -#: src/msgfmt.c:548 +#: src/msgfmt.c:517 #, no-wrap msgid "" "Input file location:\n" @@ -1093,7 +1085,7 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgfmt.c:556 +#: src/msgfmt.c:525 #, no-wrap msgid "" "Operation mode:\n" @@ -1107,7 +1099,7 @@ msgstr "" " ªºª©¥»)\n" " --tcl Tcl ¼Ò¦¡¡G²£¥Í tcl/msgcat .msg ÀÉ®×\n" -#: src/msgfmt.c:564 +#: src/msgfmt.c:533 #, no-wrap msgid "" "Output file location:\n" @@ -1120,7 +1112,7 @@ msgstr "" " --strict ¨Ï¥ÎÄY®æªº Uniforum ¼Ò¦¡\n" "¦pªG<¿é¥XÀÉ>¬O¡¥-¡¦¡A«h·|±Nµ²ªG¼g¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msgfmt.c:572 +#: src/msgfmt.c:541 #, no-wrap msgid "" "Output file location in Java mode:\n" @@ -1138,7 +1130,7 @@ msgstr "" "class ¦WºÙ¬O¥Ñ»y¨t¦WºÙ©M resource ¦WºÙ¦X¨Ö¨Ó¨M©wªº¡A¨âªÌ¤§¶¡·|¥Î©³½u¤À¹j¡C\n" "-d ¿ï¶µ¬O¥²¶·ªº¡Cclass ÀÉ·|¦s©ñ¦b«ü©wªº¥Ø¿ý¡C\n" -#: src/msgfmt.c:583 +#: src/msgfmt.c:552 #, no-wrap msgid "" "Output file location in Tcl mode:\n" @@ -1152,7 +1144,7 @@ msgstr "" " -d ¥Ø¿ý .msg ½ĶÀɦs©ñªº¥Ø¿ý\n" "-l ©M -d ¿ï¶µ¬O¥²­nªº¡C©Ò²£¥Íªº .msg ÀÉ·|¦s©ñ¦b«ü©wªº¥Ø¿ý¡C\n" -#: src/msgfmt.c:592 +#: src/msgfmt.c:561 #, no-wrap msgid "" "Input file interpretation:\n" @@ -1178,7 +1170,7 @@ msgstr "" " --check-accelerators[=CHAR] Àˬd¿ï³æ¶µ¥Ø¤¤ªº±¶®|Áä¼Ð°O¬O§_¦s¦b\n" " -f, --use-fuzzy ¿é¥XÀÉ·|¨Ï¥Î¼Ò½kªºÂ½Ä¶±ø¥Ø\n" -#: src/msgfmt.c:607 +#: src/msgfmt.c:576 #, c-format, no-wrap msgid "" "Output details:\n" @@ -1189,7 +1181,7 @@ msgstr "" " -a, --alignment=¼Æ¦r ¥H<¼Æ¦r>­Ó¦ì¤¸²Õ¬°³æ¦ì°t¸m¦r¦ê¦ì¸m(¹w³]¡G%d)\n" " --no-hash ¤G¤¸½XÀɤ£·|¥]§tÂø´êªí (hash table) ¦b¤º\n" -#: src/msgfmt.c:614 +#: src/msgfmt.c:583 #, no-wrap msgid "" "Informative output:\n" @@ -1204,72 +1196,72 @@ msgstr "" " --statistics ¦C¦L½Ķ±ø¥Øªº²Î­p\n" " -v, --verbose ¼W¥[¿é¥Xªº¸Ô²Óµ{«×\n" -#: src/msgfmt.c:766 +#: src/msgfmt.c:726 msgid "plural expression can produce negative values" msgstr "½Æ¼Æªí¥Ü¦¡¥i¯à²£¥Í­t¼Æ" -#: src/msgfmt.c:779 +#: src/msgfmt.c:739 #, c-format msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "nplurals = %lu¡A¦ý½Æ¼Æªí¥Ü¦¡ªº³Ì¤j­È¥i¯àµ¥©ó %lu" -#: src/msgfmt.c:805 +#: src/msgfmt.c:765 msgid "plural expression can produce division by zero" msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P³Q 0 ¾ã°£ªº¿ù»~" -#: src/msgfmt.c:810 +#: src/msgfmt.c:770 msgid "plural expression can produce integer overflow" msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P¾ã¼Æ·¸¦ìªº¿ù»~" -#: src/msgfmt.c:815 +#: src/msgfmt.c:775 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" msgstr "½Æ¼Æªí¥Ü¦¡·|¤Þ­P¹Bºâ¿ù»~¡A¨Ò¦p³Q 0 ¾ã°£" -#: src/msgfmt.c:894 src/msgfmt.c:906 +#: src/msgfmt.c:853 src/msgfmt.c:865 msgid "message catalog has plural form translations..." msgstr "½ĶÀɧt¦³½Æ¼Æ«¬ºAªºÂ½Ä¶..." -#: src/msgfmt.c:897 +#: src/msgfmt.c:856 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "...¦ýÀÉÀY¯Ê¤Ö¤F¡§plural=ªí¥Ü¦¡¡¨ªº¶µ¥Ø" -#: src/msgfmt.c:909 +#: src/msgfmt.c:868 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "...¦ýÀÉÀY¯Ê¤Ö¤F¡§nplurals=¾ã¼Æ¡¨ªº¶µ¥Ø" -#: src/msgfmt.c:934 +#: src/msgfmt.c:893 msgid "invalid nplurals value" msgstr "µL®Äªº nplurals ­È" -#: src/msgfmt.c:948 +#: src/msgfmt.c:907 msgid "invalid plural expression" msgstr "µL®Äªº½Æ¼Æªí¥Ü¦¡" -#: src/msgfmt.c:967 src/msgfmt.c:982 +#: src/msgfmt.c:926 src/msgfmt.c:941 #, c-format msgid "nplurals = %lu..." msgstr "nplurals = %lu..." -#: src/msgfmt.c:970 +#: src/msgfmt.c:929 #, c-format msgid "...but some messages have only one plural form" msgid_plural "...but some messages have only %lu plural forms" msgstr[0] "...¦ý¬Y¨Ç°T®§¥u¦³ %lu ºØ½Æ¼Æ«¬ºA" -#: src/msgfmt.c:985 +#: src/msgfmt.c:944 #, c-format msgid "...but some messages have one plural form" msgid_plural "...but some messages have %lu plural forms" msgstr[0] "...¦ý¬Y¨Ç°T®§¦³ %lu ºØ½Æ¼Æ«¬ºA" -#: src/msgfmt.c:1015 +#: src/msgfmt.c:974 #, c-format msgid "Try using the following, valid for %s:\n" msgstr "¹Á¸Õ¨Ï¥Î¤U¦C %s ¤¤ÄÝ©ó¦Xªkªº«¬ºA:\n" -#: src/msgfmt.c:1028 +#: src/msgfmt.c:987 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -1277,127 +1269,135 @@ msgstr "" "½ĶÀɧt¦³½Æ¼Æ«¬ºAªºÂ½Ä¶¡A¦ý¯Ê¤Ö¤F¥H¤Uªº¼ÐÀYÄæ¦ì¡G\n" "¡§Plural-Forms: nplurals=<¾ã¼Æ>; plural=<ªí¥Ü¦¡>;¡¨" -#: src/msgfmt.c:1066 +#: src/msgfmt.c:1021 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" msgstr "`msgid' ©M `msgid_plural' Äæ¦ì¨Ã«D¦P®É¥H '\\n' ¶}©l" -#: src/msgfmt.c:1076 +#: src/msgfmt.c:1031 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'" msgstr "¡¥msgid¡¦©M¡¥msgstr[%u]¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦¶}©l" -#: src/msgfmt.c:1088 +#: src/msgfmt.c:1043 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'" msgstr "¡¥msgid¡¦©M¡¥msgstr¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦¶}©l" -#: src/msgfmt.c:1105 +#: src/msgfmt.c:1060 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'" msgstr "¡¥msgid¡¦©M¡¥msgid_plural¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô" -#: src/msgfmt.c:1115 +#: src/msgfmt.c:1070 #, c-format msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'" msgstr "¡¥msgid¡¦©M¡¥msgstr[%u]¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô" -#: src/msgfmt.c:1127 +#: src/msgfmt.c:1082 msgid "`msgid' and `msgstr' entries do not both end with '\\n'" msgstr "¡¥msgid¡¦©M¡¥msgstr¡¦Äæ¦ì¨Ã«D¦P®É¥H¡¥\\n¡¦µ²§ô" -#: src/msgfmt.c:1139 +#: src/msgfmt.c:1094 msgid "plural handling is a GNU gettext extension" msgstr "½Æ¼Æ³B²z¬O GNU gettext ªºÂX®i¥\¯à" -#: src/msgfmt.c:1204 +#: src/msgfmt.c:1159 #, c-format msgid "'%s' is not a valid %s format string, unlike 'msgid'" msgstr "¤£¹³¡¥msgid¡¦¡A¡¥%s¡¦¤£¬O¦³®Äªº %s ®æ¦¡¦r¦ê" -#: src/msgfmt.c:1242 +#: src/msgfmt.c:1197 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr ¯Ê¤Ö¤F±¶®|Áä¼Ð°O¡¥%c¡¦" -#: src/msgfmt.c:1250 +#: src/msgfmt.c:1205 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr §t¦³¹L¦hªº±¶®|Áä¼Ð°O¡¥%c¡¦" -#: src/msgfmt.c:1285 +#: src/msgfmt.c:1239 #, c-format msgid "headerfield `%s' missing in header\n" msgstr "¯Ê¤Ö¤F¼ÐÀYÄæ¦ì¡¥%s¡¦\n" -#: src/msgfmt.c:1289 +#: src/msgfmt.c:1243 #, c-format msgid "header field `%s' should start at beginning of line\n" msgstr "¼ÐÀYÄæ¦ì¡¥%s¡¦À³¸Ó¦ì©ó¦æ­º\n" -#: src/msgfmt.c:1300 +#: src/msgfmt.c:1254 msgid "some header fields still have the initial default value\n" msgstr "¬Y¨Ç¼ÐÀYÄæ¦ì¤´µM¬O¹w³]­È\n" -#: src/msgfmt.c:1312 +#: src/msgfmt.c:1266 #, c-format msgid "field `%s' still has initial default value\n" msgstr "¼ÐÀYÄæ¦ì¡¥%s¡¦¤´µM¬O¹w³]­È\n" -#: src/msgfmt.c:1354 +#: src/msgfmt.c:1306 msgid "warning: PO file header missing or invalid\n" msgstr "ĵ§i¡G¯Ê¤Ö¤F PO Àɪº¼ÐÀY©Î¬O®æ¦¡µL®Ä\n" -#: src/msgfmt.c:1357 +#: src/msgfmt.c:1309 msgid "warning: charset conversion will not work\n" msgstr "ĵ§i¡G¦r¤¸¶°Âà´«ªº¥\¯à¤£·|¥Í®Ä\n" -#: src/msgfmt.c:1367 +#: src/msgfmt.c:1319 msgid "warning: PO file header fuzzy\n" msgstr "ĵ§i¡GPO Àɪº¼ÐÀY¤´µM¬O¼Ò½kª¬ºA\n" -#: src/msgfmt.c:1369 +#: src/msgfmt.c:1321 msgid "warning: older versions of msgfmt will give an error on this\n" msgstr "ĵ§i¡G¸ûª©¥»ªº msgfmt ¹J¨ì¦¹Àɮ׮ɷ|¦L¥X¿ù»~°T®§\n" -#: src/msgfmt.c:1394 +#: src/msgfmt.c:1344 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "»â°ì¦WºÙ¡§%s¡¨¤£¾A¦X§@¬°ÀɮצWºÙ" -#: src/msgfmt.c:1399 +#: src/msgfmt.c:1349 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "»â°ì¦WºÙ¡§%s¡¨¤£¾A¦X§@¬°ÀɮצWºÙ¡G±N¨Ï¥Î¦r­º" -#: src/msgfmt.c:1410 +#: src/msgfmt.c:1360 #, c-format msgid "`domain %s' directive ignored" msgstr "©¿²¤¡¥domain %s¡¦«ü¥O" -#: src/msgfmt.c:1484 +#: src/msgfmt.c:1396 src/read-po.c:176 src/x-po.c:139 +msgid "duplicate message definition" +msgstr "­«½Æªº°T®§©w¸q" + +#: src/msgfmt.c:1397 src/read-po.c:177 src/x-po.c:140 +msgid "...this is the location of the first definition" +msgstr "...³o¬O²Ä¤@¦¸©w¸qªº¦ì¸m" + +#: src/msgfmt.c:1431 msgid "empty `msgstr' entry ignored" msgstr "©¿²¤ªÅªº¡¥msgstr¡¦Äæ¦ì" -#: src/msgfmt.c:1485 +#: src/msgfmt.c:1432 msgid "fuzzy `msgstr' entry ignored" msgstr "©¿²¤¼Ò½kªº¡¥msgstr¡¦Äæ¦ì" -#: src/msgfmt.c:1554 +#: src/msgfmt.c:1499 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s¡Gĵ§i¡G­ì©lÀÉ¥]§t¼Ò½k½Ķ±ø¥Ø" -#: src/msggrep.c:390 +#: src/msggrep.c:383 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "¥¼«ü©w¡¥K¡¦©Î¡¥T¡¦«e¤£¯à¨Ï¥Î¿ï¶µ¡¥%c¡¦" -#: src/msggrep.c:412 +#: src/msggrep.c:404 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" "or belong to some given source files.\n" msgstr "©â¨ú½ĶÀɤ¤ªº°T®§¡A¦Ó³o¨Ç°T®§²Å¦X¬YºØ¼Ë¦¡©ÎÄÝ©ó¬Y­Ó«ü©wªº¨Ó·½ÀÉ¡C\n" -#: src/msggrep.c:439 +#: src/msggrep.c:431 #, no-wrap msgid "" "Message selection:\n" @@ -1451,7 +1451,7 @@ msgstr "" " -f, --file=FILE PATTERN ±Ä¥Î FILE ªº¤º®e \n" " -i, --ignore-case ©¿²¤¤j¤p¼g\n" -#: src/msggrep.c:469 +#: src/msggrep.c:461 #, no-wrap msgid "" "Output details:\n" @@ -1481,11 +1481,11 @@ msgstr "" " --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msggrep.c:561 +#: src/msggrep.c:545 msgid "write to grep subprocess failed" msgstr "¼g¤J¦Ü grep °Æµ{§Ç®É¥X²{¿ù»~" -#: src/msginit.c:284 +#: src/msginit.c:258 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1494,7 +1494,7 @@ msgstr "" "¨t²ÎÀô¹Ò¨S¦³¥ô¦ó©M»y¨¥¦³Ãöªº³]©w¡C½Ð®Ú¾Ú ABOUT-NLS Àɮשҭz¡A\n" "³]©w LANG Àô¹ÒÅܼơC³o¬O´ú¸Õ½Ķ®Éªº¥²­n¨BÆJ¡C\n" -#: src/msginit.c:312 +#: src/msginit.c:286 #, c-format msgid "" "Output file %s already exists.\n" @@ -1505,19 +1505,19 @@ msgstr "" "½Ð³z¹L --locale ¿ï¶µ«ü©w»y¨t©Î\n" "--output-file ¿ï¶µ«ü©w¿é¥Xªº .po ÀÉ¡C\n" -#: src/msginit.c:335 +#: src/msginit.c:309 #, c-format msgid "Created %s.\n" msgstr "¤w«Ø¥ß %s¡C\n" -#: src/msginit.c:357 +#: src/msginit.c:330 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "«Ø¥ß·sªº PO ÀÉ¡A¨Ã¥Ñ¨Ï¥ÎªÌÀô¹Ò¨ú±oªì©l¤Æ©Ò»ÝªºÀÉÀY¸ê®Æ¡C\n" -#: src/msginit.c:368 +#: src/msginit.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1530,7 +1530,7 @@ msgstr "" "¦pªG¨S¦³«ü©w¿é¤JÀÉ¡A·|¦b¥Ø«eªº¥Ø¿ý·j´M POT ÀÉ¡C\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msginit.c:376 +#: src/msginit.c:349 #, no-wrap msgid "" "Output file location:\n" @@ -1543,7 +1543,7 @@ msgstr "" "¦pªG¨S¦³«ü©w<¿é¥XÀÉ>¡A«hÀɦW±N·|¥Ñ --locale ¿ï¶µ©Î¬O¨Ï¥ÎªÌªº»y¨t¨M©w¡C\n" "¦pªG<¿é¥XÀÉ>¬O¡¥-¡¦¡A«h·|±Nµ²ªG¼g¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msginit.c:384 +#: src/msginit.c:357 #, no-wrap msgid "" "Output details:\n" @@ -1559,7 +1559,7 @@ msgstr "" " -w, --width=¼Æ¦r ³]©w¿é¥Xªº¼e«×\n" " --no-wrap §Y¨Ï¿é¥Xªº°T®§¶W¥X­¶¼e¡A¤]¤£±N¿é¥Xªº°T®§Â_¦æ\n" -#: src/msginit.c:437 +#: src/msginit.c:410 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1567,11 +1567,11 @@ msgstr "" "§ä¨ì¦h©ó¤@­Óªº .pot ÀÉ¡C\n" "½Ð³z¹L --input ¿ï¶µ«ü©w§@¬°¿é¤JÀɪº .pot ÀÉ¡C\n" -#: src/msginit.c:445 src/msginit.c:450 +#: src/msginit.c:418 src/msginit.c:423 msgid "error reading current directory" msgstr "Ū¨ú¥Ø«eªº¥Ø¿ý®Éµo¥Í¿ù»~" -#: src/msginit.c:458 +#: src/msginit.c:431 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1579,23 +1579,23 @@ msgstr "" "¦b¥Ø«e¥Ø¿ý¤¤§ä¤£¨ì¥ô¦ó .pot ÀÉ¡C\n" "½Ð³z¹L --input ¿ï¶µ«ü©w§@¬°¿é¤JÀɪº .pot ÀÉ¡C\n" -#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 -#: src/read-java.c:80 +#: src/msginit.c:879 src/msginit.c:931 src/msginit.c:1068 src/msginit.c:1135 +#: src/read-java.c:70 msgid "fdopen() failed" msgstr "fdopen() ¥¢±Ñ" -#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 +#: src/msginit.c:884 src/msginit.c:936 src/msginit.c:1073 #, c-format msgid "%s subprocess I/O error" msgstr "%s °Æµ{§Ç¿é¥X/¿é¤J¿ù»~" -#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 -#: src/read-java.c:90 +#: src/msginit.c:893 src/msginit.c:945 src/msginit.c:1082 src/msginit.c:1149 +#: src/read-java.c:80 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s °Æµ{§Ç¥¢±Ñ¡A¿ù»~½X¬° %d" -#: src/msginit.c:1088 +#: src/msginit.c:1058 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1609,52 +1609,52 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1432 +#: src/msginit.c:1417 #, c-format msgid "English translations for %s package" msgstr "traditional Chinese translation for %s" -#: src/msgl-cat.c:187 src/msgl-charset.c:87 src/msgl-iconv.c:318 +#: src/msgl-cat.c:175 src/msgl-charset.c:86 src/msgl-iconv.c:302 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "¥Ø«eªº¦r¤¸¶°½s½X¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ" -#: src/msgl-cat.c:196 src/msgl-iconv.c:329 +#: src/msgl-cat.c:184 src/msgl-iconv.c:313 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "¿é¤JÀɦ³¨âºØ¤£¦Pªº¦r¤¸¶°½s½X¡§%s¡¨©M¡§%s¡¨" -#: src/msgl-cat.c:209 +#: src/msgl-cat.c:197 #, c-format msgid "" "input file `%s' doesn't contain a header entry with a charset specification" msgstr "¿é¤JÀÉ¡¥%s¡¦¨S¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì" -#: src/msgl-cat.c:213 +#: src/msgl-cat.c:201 #, c-format msgid "" "domain \"%s\" in input file `%s' doesn't contain a header entry with a " "charset specification" msgstr "¿é¤JÀÉ¡¥%2$s¡¦ªº»â°ì¡§%1$s¡¨¨S¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì" -#: src/msgl-cat.c:374 src/msgl-iconv.c:406 +#: src/msgl-cat.c:362 src/msgl-iconv.c:390 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "¥Ø¼Ðªº¦r¤¸¶°½s½X¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ¡C" -#: src/msgl-cat.c:424 src/msgl-cat.c:430 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:782 src/write-po.c:876 +#: src/msgl-cat.c:412 src/msgl-cat.c:418 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/write-po.c:737 src/write-po.c:829 msgid "warning: " msgstr "ĵ§i¡G" -#: src/msgl-cat.c:425 +#: src/msgl-cat.c:413 msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" "Converting the output to UTF-8.\n" msgstr "" "¿é¤JÀɧt¦³¤£¦P½s½Xªº°T®§¡A¨ä¤¤¤@ºØ¬O UTF-8¡C·|±N¿é¥Xªº½s½XÂà´«¬° UTF-8¡C\n" -#: src/msgl-cat.c:431 +#: src/msgl-cat.c:419 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -1665,7 +1665,7 @@ msgstr "" "¿é¤JÀɧt¦³¤£¦P½s½Xªº°T®§¡A¨ä¤¤¥]¬A %s ©M %s¡C·|±N¿é¥Xªº½s½XÂà´«¬° UTF-8¡C\n" "­Y­n¿ï¾Ü¥t¤@ºØ¿é¥X½s½X¡A½Ð¨Ï¥Î --to-code ¿ï¶µ¡C\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -1677,12 +1677,12 @@ msgstr "" "¡¥%s¡¦ªº¿é¥X¥i¯à¦³»~¡C\n" "¥i¦æªº¸Ñ¨M¤èªk¥]¬A¡G\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "¡´ ³]©w LC_ALL Àô¹ÒÅܼƬ°¨Ï¥Î½s½X %s ªº»y¨t¡C\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -1693,7 +1693,7 @@ msgstr "" " µM«á®M¥Î¡¥%s¡¦«ü¥O¡A\n" " ³Ì«á¥Î¡¥msgconv¡¦±N½ĶÀɪº¦r¤¸¶°Á٭쬰 %s¡C\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -1706,7 +1706,7 @@ msgstr "" " µM«á®M¥Î¡¥%s¡¦«ü¥O¡A\n" " ³Ì«á¥Î¡¥msgconv¡¦±N½ĶÀɪº¦r¤¸¶°Á٭쬰 %s¡C\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -1717,15 +1717,15 @@ msgstr "" "¡¥%s¡¦ªº¿é¥X¥i¯à¦³»~¡C\n" "³]©w LC_ALL=C ¬O¤@­Ó¥i¦æªº¸Ñ¨M¤èªk¡C\n" -#: src/msgl-iconv.c:202 src/msgl-iconv.c:256 +#: src/msgl-iconv.c:184 src/msgl-iconv.c:242 msgid "conversion failure" msgstr "Âà´«¿ù»~" -#: src/msgl-iconv.c:351 +#: src/msgl-iconv.c:335 msgid "input file doesn't contain a header entry with a charset specification" msgstr "¿é¤JÀɨS¦³«ü©w¦r¤¸¶°ªº¼ÐÀYÄæ¦ì" -#: src/msgl-iconv.c:369 +#: src/msgl-iconv.c:353 src/xgettext.c:487 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -1734,7 +1734,7 @@ msgstr "" "¤£¤ä´©±N¦r¤¸¶°¥Ñ¡§%s¡¨Âà´«¦Ü¡§%s¡¨¡C%s »Ý­n iconv()¡A\n" "¦ý iconv() ¤£¤ä´©¦¹ºØÂà´«¤è¦¡¡C" -#: src/msgl-iconv.c:385 +#: src/msgl-iconv.c:370 src/xgettext.c:494 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -1743,11 +1743,11 @@ msgstr "" "¤£¤ä´©±N¦r¤¸¶°¥Ñ¡§%s¡¨Âà´«¦Ü¡§%s¡¨¡C%s »Ý­n iconv()¡A\n" "¦ý½sĶ¦¹µ{¦¡®É¨S¦³ iconv() ¤ä´©¡C" -#: src/msgmerge.c:358 +#: src/msgmerge.c:351 msgid "backup type" msgstr "³Æ¥÷¤è¦¡" -#: src/msgmerge.c:395 +#: src/msgmerge.c:387 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1767,7 +1767,7 @@ msgstr "" "ªºµù¸Ñ³£·|³Q±Ë±ó¡A¦ý¯S®íºX¼Ðµù¸Ñ©MÀɮצì¸m³£·|³Q«O¯d¡C¤ñ¸û®É¦pªG¦³¤£§¹¥þ\n" "°t¦Xªº¦r¦ê¥X²{¡Aµ{¦¡·|¥H¼Ò½k°t¹ïªº¤è¦¡±o¥X¸û¦nªºµ²ªG¡C\n" -#: src/msgmerge.c:413 +#: src/msgmerge.c:405 #, no-wrap msgid "" "Input file location:\n" @@ -1783,7 +1783,7 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" " -C, --compendium=ÀÉ®× ÃB¥~ªºÂ½Ä¶°T®§®w¡A¥i¨Ï¥Î¦h©ó¤@¦¸\n" -#: src/msgmerge.c:423 +#: src/msgmerge.c:415 #, no-wrap msgid "" "Operation mode:\n" @@ -1794,7 +1794,7 @@ msgstr "" " -U, --update §ó·s def.po¡A©Î¬O·í def.po ¤w¬O³Ì·sª©¥»®É¡A\n" " ¤£¶i¦æ¥ô¦ó¾Þ§@¡C\n" -#: src/msgmerge.c:438 +#: src/msgmerge.c:430 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1823,7 +1823,7 @@ msgstr "" "³Æ¥÷Àɪº«á¸m¦r¤¸¬°¡¥~¡¦¡A°£«D¥H --suffix ¿ï¶µ©Î¬O SIMPLE_BACKUP_SUFFIX\n" "Àô¹ÒÅܼƫü©w¡C\n" -#: src/msgmerge.c:477 +#: src/msgmerge.c:469 #, no-wrap msgid "" "Informative output:\n" @@ -1838,15 +1838,15 @@ msgstr "" " -v, --verbose ¼W¥[¿é¥Xªº¸Ô²Óµ{«×\n" " -q, --quiet, --silent ¤£Åã¥Ü¶i«×«ü¥Ü\n" -#: src/msgmerge.c:937 +#: src/msgmerge.c:919 msgid "this message should define plural forms" msgstr "¦¹°T®§À³¸Ó¦³½Æ¼Æ«¬ºA" -#: src/msgmerge.c:960 +#: src/msgmerge.c:942 msgid "this message should not define plural forms" msgstr "¦¹°T®§¤£À³¦³½Æ¼Æ«¬ºA" -#: src/msgmerge.c:1091 +#: src/msgmerge.c:1104 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1856,11 +1856,11 @@ msgstr "" "Ū¤J %ld ½Ķ + %ld °Ñ¦Ò±ø¥Ø¡C¦X¨Ö¡G%ld¡A¼Ò½k¡G%ld¡A¥¼Ä¶¡G%ld¡A¹L®É¡G%" "ld¡C\n" -#: src/msgmerge.c:1099 +#: src/msgmerge.c:1112 msgid " done.\n" msgstr " §¹¦¨¡C\n" -#: src/msgunfmt.c:226 src/msgunfmt.c:235 +#: src/msgunfmt.c:227 src/msgunfmt.c:236 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "¨Ï¥Î %s ¤£¯à¦P®É«ü©wÀɮצWºÙ" @@ -2006,19 +2006,19 @@ msgstr "" " -d, --repeated ¥u¦L¥X­«ÂЪº±ø¥Ø\n" " -u, --unique ¥u¦L¥X¥X²{¤@¦¸ªº±ø¥Ø¡A±Ë±ó¥ô¦ó­«ÂЪº±ø¥Ø\n" -#: src/ngettext.c:215 +#: src/ngettext.c:211 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [¤å¦r»â°ì] MSGID ½Æ¼Æ-MSGID ¼Æ¦r\n" -#: src/ngettext.c:220 +#: src/ngettext.c:216 #, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "Åã¥Ü¬Y¤å¦r°T®§ªº¥»¦a»y¨¥Â½Ä¶¡A¦Ó½Ķªº¤åªk©M¼Æ¦r¦³Ãö¡C\n" -#: src/ngettext.c:225 +#: src/ngettext.c:221 #, no-wrap msgid "" " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n" @@ -2039,7 +2039,7 @@ msgstr "" " MSGID ½Æ¼Æ-MSGID ½Ķ MSGID (³æ¼Æ) / ½Æ¼Æ-MSGID (½Æ¼Æ)\n" " ¼Æ¦r ®Ú¾Ú<¼Æ¦r>¨Ó¿ï¾Ü³æ¼Æ©Î½Æ¼Æ«¬ºA\n" -#: src/ngettext.c:236 +#: src/ngettext.c:232 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -2053,17 +2053,17 @@ msgstr "" "ªº©Ò¦bªº¦ì¸m¡C\n" "¼Ð·Çªº·j´M¥Ø¿ý¬°¡G%s\n" -#: src/open-po.c:60 +#: src/open-po.c:58 msgid "" msgstr "<¼Ð·Ç¿é¤J>" -#: src/po-charset.c:225 src/po-charset.c:283 src/po-charset.c:311 -#: src/po-charset.c:337 +#: src/po-charset.c:224 src/po-charset.c:282 src/po-charset.c:310 +#: src/po-charset.c:336 #, c-format msgid "%s: warning: " msgstr "%s¡Gĵ§i¡G" -#: src/po-charset.c:226 +#: src/po-charset.c:225 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -2072,15 +2072,15 @@ msgstr "" "¦r¤¸¶°¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ¡C\n" "Âà´«°T®§¦Ü¨Ï¥ÎªÌ¦r¤¸¶°ªº¥\¯à±N¤£·|¹B§@¡C\n" -#: src/po-charset.c:279 src/po-charset.c:309 +#: src/po-charset.c:278 src/po-charset.c:308 msgid "Continuing anyway, expect parse errors." msgstr "¤´·|Ä~Äò°õ¦æ¡A¦ý¹w­p·|¥X²{¤ÀªR¿ù»~¡C" -#: src/po-charset.c:281 +#: src/po-charset.c:280 msgid "Continuing anyway." msgstr "¤´·|Ä~Äò°õ¦æ¡C" -#: src/po-charset.c:284 +#: src/po-charset.c:283 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -2089,18 +2089,18 @@ msgstr "" "¤£¤ä´©¦r¤¸¶°¡§%s¡¨¡C%s »Ý­n iconv()¡A\n" "¦ý iconv() ¤£¤ä´©¡§%s¡¨¡C\n" -#: src/po-charset.c:293 src/po-charset.c:319 +#: src/po-charset.c:292 src/po-charset.c:318 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" msgstr "¥ý¦w¸Ë GNU libiconv¡AµM«á¦A¦w¸Ë GNU gettext¡A±N·|­×¥¿¦¹°ÝÃD¡C\n" -#: src/po-charset.c:298 src/po-charset.c:323 +#: src/po-charset.c:297 src/po-charset.c:322 #, c-format msgid "%s\n" msgstr "%s\n" -#: src/po-charset.c:312 +#: src/po-charset.c:311 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -2109,7 +2109,7 @@ msgstr "" "¤£¤ä´©¦r¤¸¶°¡§%s¡¨¡C%s »Ý­n iconv()¡A\n" "¦ý½sĶ¦¹µ{¦¡®É¨S¦³ iconv() ¤ä´©¡C\n" -#: src/po-charset.c:338 +#: src/po-charset.c:337 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -2142,79 +2142,79 @@ msgid "plural form has wrong index" msgstr "½Æ¼Æ®æ¦¡§t¦³¿ù»~ªº¯Á¤Þ¼Æ¦r" #: src/po-lex.h:91 src/po-lex.h:106 src/po-lex.h:126 src/po-lex.h:141 -#: src/po-lex.c:111 src/po-lex.c:144 +#: src/po-lex.c:102 src/po-lex.c:131 msgid "too many errors, aborting" msgstr "¿ù»~¤Ó¦h¡A¥²¶·¤¤Â_§@·~" -#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466 +#: src/po-lex.c:455 src/write-po.c:323 src/write-po.c:425 msgid "invalid multibyte sequence" msgstr "µL®Äªº¦h¦r¤¸§Ç¦C" -#: src/po-lex.c:543 +#: src/po-lex.c:481 msgid "incomplete multibyte sequence at end of file" msgstr "ÀÉ®×¥½ºÝ¥X²{¤£§¹¾ãªº¦h¦r¤¸§Ç¦C" -#: src/po-lex.c:553 +#: src/po-lex.c:491 msgid "incomplete multibyte sequence at end of line" msgstr "¦æ¥½¥X²{¤£§¹¾ãªº¦h¦r¤¸§Ç¦C" -#: src/po-lex.c:561 +#: src/po-lex.c:499 msgid "iconv failure" msgstr "iconv ¥¢±Ñ" -#: src/po-lex.c:759 src/read-mo.c:95 src/x-c.c:299 src/x-elisp.c:172 -#: src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:104 +#: src/po-lex.c:682 src/read-mo.c:79 src/x-c.c:260 src/x-elisp.c:142 +#: src/x-librep.c:144 src/x-lisp.c:204 src/x-rst.c:225 src/x-ycp.c:94 #, c-format msgid "error while reading \"%s\"" msgstr "Ū¨ú¡§%s¡¨®É¥X²{¿ù»~" -#: src/po-lex.c:825 +#: src/po-lex.c:746 #, c-format msgid "keyword \"%s\" unknown" msgstr "¤£©úªºÃöÁä¦r¡§%s¡¨" -#: src/po-lex.c:935 +#: src/po-lex.c:856 msgid "invalid control sequence" msgstr "µL®Äªº±±¨î§Ç¦C" -#: src/po-lex.c:1043 +#: src/po-lex.c:964 msgid "end-of-file within string" msgstr "Àɮצb¦r¦ê¤¤¬q¬ðµMµ²§ô" -#: src/po-lex.c:1049 +#: src/po-lex.c:970 msgid "end-of-line within string" msgstr "¦r¦ê¤¤¶¡¬ðµMÂ_¦æ" -#: src/read-mo.c:116 src/read-mo.c:140 src/read-mo.c:188 src/read-mo.c:210 +#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190 #, fuzzy, c-format msgid "file \"%s\" is truncated" msgstr "Àɮס§%s¡¨³QºIÂ_¤F" -#: src/read-mo.c:143 +#: src/read-mo.c:122 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "Àɮס§%s¡¨¥]§t¨Ã«D¥H NUL ¬°µ²§Àªº¦r¦ê" -#: src/read-mo.c:181 src/read-mo.c:285 +#: src/read-mo.c:157 src/read-mo.c:263 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "Àɮס§%s¡¨¨Ã«D GNU .mo ®æ¦¡ÀÉ®×" -#: src/read-mo.c:191 +#: src/read-mo.c:170 #, fuzzy, c-format -msgid "file \"%s\" contains a not NUL terminated sysdep segment" +msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "Àɮס§%s¡¨¥]§t¨Ã«D¥H NUL ¬°µ²§Àªº¦r¦ê" -#: src/urlget.c:150 +#: src/urlget.c:143 msgid "expected two arguments" msgstr "»Ý­n«ê¦n¨â­Ó°Ñ¼Æ" -#: src/urlget.c:169 +#: src/urlget.c:161 #, c-format, no-wrap msgid "Usage: %s [OPTION] URL FILE\n" msgstr "¥Îªk¡G%s [¿ï¶µ] ºô§} ÀÉ®×\n" -#: src/urlget.c:174 +#: src/urlget.c:166 #, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -2223,51 +2223,51 @@ msgstr "" "Â^¨ú¨Ã¿é¥X¬Y<ºô§}>ªº¤º®e¡C¦pªGµLªk¦s¨ú¸Ó<ºô§}>¡A\n" "«h·|¨Ï¥Î«ü©wªº¥»¾÷<ÀÉ®×>¥N´À¡C\n" -#: src/urlget.c:222 +#: src/urlget.c:213 msgid "error writing stdout" msgstr "¼g¤J¦Ü¼Ð·Ç¿é¥X®Éµo¥Í¿ù»~" -#: src/write-java.c:1109 +#: src/write-java.c:1055 msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "§ä¤£¨ì¼È¦sÀɥؿý¡A¥¿¹Á¸Õ³]©w $TMPDIR" -#: src/write-java.c:1119 +#: src/write-java.c:1065 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "µLªk®Ú¾Ú¼Ë¦¡¡§%s¡¨«Ø¥ß¼È¦sÀɥؿý" -#: src/write-java.c:1132 +#: src/write-java.c:1078 #, c-format msgid "not a valid Java class name: %s" msgstr "¨Ã«D¦³®Äªº Java class ¦WºÙ¡G%s" -#: src/write-java.c:1189 src/write-java.c:1202 +#: src/write-java.c:1135 src/write-java.c:1148 #, c-format msgid "failed to create \"%s\"" msgstr "µLªk«Ø¥ß¡§%s¡¨" -#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025 +#: src/write-java.c:1156 src/write-mo.c:702 src/write-po.c:975 #, c-format msgid "error while writing \"%s\" file" msgstr "·í¼g¤JÀɮס§%s¡¨®Éµo¥Í¿ù»~" -#: src/write-java.c:1224 +#: src/write-java.c:1170 msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "½sĶ Java class ÀÉ¥X²{¿ù»~¡A½Ð¹Á¸Õ¨Ï¥Î --verbose ¿ï¶µ©Î³]©w $JAVAC Àô¹ÒÅܼÆ" -#: src/write-mo.c:701 +#: src/write-mo.c:690 #, c-format msgid "error while opening \"%s\" for writing" msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³Æ¼g¤J®Éµo¥Í¿ù»~" -#: src/write-po.c:415 +#: src/write-po.c:374 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "°ê»Ú¤Æªº°T®§¤£À³§t¦³¡¥\\%c¡¦³o­Ó·¸¥X§Ç¦C¦r¤¸" -#: src/write-po.c:783 src/write-po.c:877 +#: src/write-po.c:738 src/write-po.c:830 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2280,71 +2280,71 @@ msgstr "" "½Ð¦Ò¼{¨Ï¥Î¥u¦³ ASCII ¦r¤¸ªº msgid¡C\n" "%s\n" -#: src/write-po.c:944 +#: src/write-po.c:894 #, c-format msgid "cannot create output file \"%s\"" msgstr "µLªk«Ø¥ß¿é¥XÀÉ¡§%s¡¨" -#: src/write-po.c:951 +#: src/write-po.c:901 #, no-c-format msgid "standard output" msgstr "¼Ð·Ç¿é¥X" -#: src/x-c.c:954 +#: src/x-c.c:906 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s¡G%d¡Gĵ§i¡G¥¼§¹µ²ªº¦r¤¸±`¼Æ" -#: src/x-c.c:978 +#: src/x-c.c:930 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "%s¡G%d¡Gĵ§i¡G¥¼§¹µ²ªº¦r¦ê" -#: src/x-po.c:106 src/xgettext.c:648 +#: src/x-po.c:85 src/xgettext.c:710 msgid "this file may not contain domain directives" msgstr "¦¹Àɮפ£¯à§t¦³»â°ì«ü¥O" -#: src/x-rst.c:108 +#: src/x-rst.c:106 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s¡G%d¡GµL®Äªº¦r¦ê©w¸q" -#: src/x-rst.c:168 +#: src/x-rst.c:166 #, c-format msgid "%s:%d: missing number after #" msgstr "%s¡G%d¡G# «á¯Ê¤Ö¤F¼Æ¦r" -#: src/x-rst.c:203 +#: src/x-rst.c:201 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s¡G%d¡GµL®Äªº¦r¦êªí¥Ü¦¡" -#: src/xgettext.c:401 +#: src/xgettext.c:420 msgid "--join-existing cannot be used when output is written to stdout" msgstr "·íµ²ªG³Q¾É¦V¦Ü¼Ð·Ç¿é¥X®É¡A¿ï¶µ --join-existing ¤£¯à¨Ï¥Î" -#: src/xgettext.c:406 +#: src/xgettext.c:425 msgid "xgettext cannot work without keywords to look for" msgstr "­YµLÃöÁä¦r¡Axgettext ±NµLªk¹B§@" -#: src/xgettext.c:502 +#: src/xgettext.c:552 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "ĵ§i¡GÀɮס¥%s¡¦ªº°ÆÀɦW¡¥%s¡¦¥¼©ú¡F·|°²³]¬O C ®æ¦¡¨Ó³B²z" -#: src/xgettext.c:547 +#: src/xgettext.c:603 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "¥Ñ«ü©wªº¿é¤JÀÉ©â¨ú¥i½Ķªº¦r¦ê¡C\n" -#: src/xgettext.c:552 +#: src/xgettext.c:608 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "ªø¿ï¶µ¥²­nªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²­nªº¡C¹ï©ó¿ï¾Ü©Êªº°Ñ¼Æ¤]¤@¼Ë¡C\n" -#: src/xgettext.c:567 +#: src/xgettext.c:623 #, no-wrap msgid "" "Output file location:\n" @@ -2358,14 +2358,14 @@ msgstr "" " -o, --output=ÀÉ®× ±Nµ²ªG¼g¤J¦Ü«ü©wªºÀÉ®×\n" " -p, --output-dir=¥Ø¿ý ¿é¥XÀÉ·|©ñ¦b«ü©wªº<¥Ø¿ý>\n" -#: src/xgettext.c:576 -#, no-wrap +#: src/xgettext.c:632 +#, fuzzy, no-wrap msgid "" "Choice of input file language:\n" " -L, --language=NAME recognise the specified language\n" " (C, C++, ObjectiveC, PO, Python, Lisp,\n" -" EmacsLisp, librep, Java, awk, YCP, Tcl,\n" -" RST, Glade)\n" +" EmacsLisp, librep, Smalltalk, Java, awk,\n" +" YCP, Tcl, PHP, RST, Glade)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -2377,7 +2377,16 @@ msgstr "" " -C, --c++ --language=C++ ªºÁY¼g\n" "¹w³]ªº»y¨¥¬O¥Ñ¿é¤JÀɪº©µ¦ùÀɦW¨M©wªº¡C\n" -#: src/xgettext.c:587 +#: src/xgettext.c:643 +#, no-wrap +msgid "" +"Input file interpretation:\n" +" --from-code=NAME encoding of input files\n" +" (except for Python, Tcl, Glade)\n" +"By default the input files are assumed to be in ASCII.\n" +msgstr "" + +#: src/xgettext.c:651 #, no-wrap msgid "" "Operation mode:\n" @@ -2392,7 +2401,7 @@ msgstr "" " -c, --add-comments[=TAG] ¦b¿é¥XÀɤ¤¼W¥[µù¸Ñ°Ï¶ô TAG (or those\n" " preceding keyword lines) in output file\n" -#: src/xgettext.c:596 +#: src/xgettext.c:660 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2409,7 +2418,7 @@ msgstr "" " -T, --trigraphs ¯d·N¿é¤J¸ê®Æ¤¤ªº ANSI C trigraph\n" " --debug ¶i¦æ®æ¦¡¦r¦êÃѧO®ÉÅã¥Ü§ó¸Ô²Óªºµ²ªG\n" -#: src/xgettext.c:606 +#: src/xgettext.c:670 #, no-wrap msgid "" "Output details:\n" @@ -2451,11 +2460,18 @@ msgstr "" " -M, --msgstr-suffix[=¦r¦ê] msgstr ±ø¥Ø¨Ï¥Î<¦r¦ê>§@¬°«á¸m¦r¦ê\n" " (¹w³]¬°ªÅ¥Õ¦r¦ê \"\")\n" -#: src/xgettext.c:828 +#: src/xgettext.c:879 msgid "standard input" msgstr "¼Ð·Ç¿é¤J" -#: src/xgettext.c:943 +#: src/xgettext.c:972 +#, c-format +msgid "" +"Non-ASCII string at %s%s.\n" +"Please specify the source encoding through --from-code." +msgstr "" + +#: src/xgettext.c:1028 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2465,11 +2481,15 @@ msgstr "" "gettext(\"\") ·|¦^¶ÇÀɮ׶}©l³¡¥÷ªº¸ê°T¡A\n" "¨Ã«DªÅ¥Õ¦r¦ê¡C\n" -#: src/xgettext.c:1299 +#: src/xgettext.c:1410 #, c-format msgid "language `%s' unknown" msgstr "¤£©úªº»y¨¥¡¥%s¡¦" +#, fuzzy +#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment" +#~ msgstr "Àɮס§%s¡¨¥]§t¨Ã«D¥H NUL ¬°µ²§Àªº¦r¦ê" + #~ msgid "seek \"%s\" offset %ld failed" #~ msgstr "·j´M¡§%s¡¨ªº¦ì¸m %ld ¥¢±Ñ" diff --git a/projects/Makefile.in b/projects/Makefile.in index 60968ea8a..65b5855f9 100644 --- a/projects/Makefile.in +++ b/projects/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/src/Makefile.in b/src/Makefile.in index a2304051a..649211184 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -112,7 +112,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -120,7 +119,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 9370e3ed0..067f0c198 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -115,7 +115,6 @@ LIB = @LIB@ LIBEXPAT = @LIBEXPAT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTALLOCA = @LTALLOCA@ @@ -123,7 +122,6 @@ LTLIB = @LTLIB@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -169,7 +167,7 @@ TESTS = gettext-1 gettext-2 \ msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \ msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \ msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 msgmerge-17 \ - msgmerge-18 msgmerge-19 msgmerge-20 msgmerge-21 \ + msgmerge-18 msgmerge-19 msgmerge-20 msgmerge-21 msgmerge-22 \ msgunfmt-1 msgunfmt-2 msgunfmt-3 \ msguniq-1 msguniq-2 msguniq-3 \ xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \ diff --git a/tests/rpathlx/aclocal.m4 b/tests/rpathlx/aclocal.m4 index 297583801..c14bba9aa 100644 --- a/tests/rpathlx/aclocal.m4 +++ b/tests/rpathlx/aclocal.m4 @@ -1195,7 +1195,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -1226,6 +1226,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathlx/configure b/tests/rpathlx/configure index 09e5dfc03..4870fb76a 100755 --- a/tests/rpathlx/configure +++ b/tests/rpathlx/configure @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# 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 -# 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" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -55,24 +215,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +237,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -94,9 +251,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +263,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBRPATHX LTLIBRPATHX global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -144,13 +312,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +444,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +623,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +635,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +663,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,13 +689,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -560,7 +735,7 @@ ac_cv_env_CPPFLAGS_value=$CPPFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -695,31 +890,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -738,51 +933,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -796,21 +1036,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -823,6 +1095,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -834,9 +1133,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:837: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -845,7 +1144,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:848: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -853,7 +1152,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:856: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -869,42 +1168,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:872: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:876: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:882: 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:884: 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:886: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:905: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:907: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -915,26 +1214,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:930: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -953,7 +1249,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -973,43 +1269,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:976: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1022,7 +1323,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1025: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1033,7 +1334,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1036: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1057,7 +1358,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1060: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1070,13 +1371,13 @@ then # Ok. : else - { { echo "$as_me:1073: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1079: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1091,6 +1392,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1101,15 +1403,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1112: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1117,41 +1419,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1127: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1135: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1138: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1145: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1162,11 +1467,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1165: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1169: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1181,6 +1486,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1189,6 +1495,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1199,10 +1508,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1205: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1211,13 +1521,15 @@ fi PACKAGE=gettext_rpathlx VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1230,18 +1542,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1259,7 +1577,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1262: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1267,25 +1585,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1277: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1285: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1288: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1294,7 +1615,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1297: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1302,25 +1623,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1312: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1320: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1323: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1333,7 +1657,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1336: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1341,25 +1665,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1351: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1359: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1362: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1368,7 +1695,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1371: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1376,25 +1703,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1386: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1394: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1397: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1407,7 +1737,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1410: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1416,19 +1746,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1430: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1440,19 +1773,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1452: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1455: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1463,7 +1794,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1466: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1471,25 +1802,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1481: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1489: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1492: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1502,7 +1836,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1505: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1510,25 +1844,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1520: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1528: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1531: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1540,33 +1877,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1548:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1551: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1554: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1556: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1559: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1561: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1564: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1568 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1577,100 +1921,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1584: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1613: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1619: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1624: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1630: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1633: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1640: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1648: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1655: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1657: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1660: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1662: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1678,26 +2042,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1681: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1687: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1693: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1699 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1708,40 +2078,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1714: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1726: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1733: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1737: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1743 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1755,41 +2132,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1761: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1764: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1767: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1779: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1785: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1791 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1800,26 +2182,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1806: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1809: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1812: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1822: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1836,6 +2219,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1846,16 +2325,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1852: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1855: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1858: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1867,8 +2346,12 @@ if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1870 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -1880,27 +2363,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1886: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1889: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1892: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1902 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -1911,21 +2399,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1917: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1920: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1923: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -1938,7 +2427,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -1947,7 +2437,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -1955,7 +2445,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:1958: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -1982,13 +2472,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:1985: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:1991: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2050,10 +2542,12 @@ else fi fi -echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -2071,11 +2565,11 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5 + { { 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:2078: checking build system type" >&5 +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 @@ -2084,23 +2578,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2087: error: cannot guess build type; you must specify one" >&5 + { { 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:2091: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2096: result: $ac_cv_build" >&5 +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:2103: checking host system type" >&5 + +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 @@ -2109,18 +2604,20 @@ else 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:2112: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2117: result: $ac_cv_host" >&5 +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" @@ -2128,10 +2625,23 @@ if test "${with_gnu_ld+set}" = set; then 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:2134: checking for ld used by GCC" >&5 + 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*) @@ -2161,10 +2671,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2164: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2167: checking for non-GNU ld" >&5 + 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 @@ -2194,16 +2704,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2197: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2200: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5 +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:2206: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -2215,11 +2725,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:2222: checking for shared library run path origin" >&5 + + + 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 @@ -2232,7 +2744,7 @@ else acl_cv_rpath=done fi -echo "$as_me:2235: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -2251,12 +2763,19 @@ else enable_rpath=yes fi; - echo "$as_me:2254: checking how to link with librpathx" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathx" >&5 echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6 if test "${ac_cv_librpathx_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2270,6 +2789,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given. if test "${with_librpathx_prefix+set}" = set; then withval="$with_librpathx_prefix" @@ -2637,7 +3157,7 @@ fi; ac_cv_librpathx_cppflags="$INCRPATHX" fi -echo "$as_me:2640: result: $ac_cv_librpathx_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" @@ -2665,9 +3185,14 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 fi done + + HAVE_LIBRPATHX=yes -ac_config_files="$ac_config_files Makefile" + + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -2678,7 +3203,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -2713,7 +3238,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -2749,7 +3274,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -2763,7 +3288,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -2774,35 +3299,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -2828,24 +3546,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -2854,10 +3568,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -2877,7 +3615,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -2887,6 +3625,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -2899,12 +3638,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -2913,9 +3652,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -2925,30 +3664,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:2951: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -2958,16 +3697,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:2970: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -2979,25 +3721,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -3005,16 +3745,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3029,6 +3771,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -3037,23 +3782,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -3066,6 +3811,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -3081,19 +3832,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -3135,11 +3880,13 @@ s,@host_os@,$host_os,;t t s,@LIBRPATHX@,$LIBRPATHX,;t t s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -3178,8 +3925,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -3193,7 +3940,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -3204,60 +3952,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:3252: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -3267,7 +4039,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5 + 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;; @@ -3280,23 +4052,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3283: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -3308,8 +4086,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -3317,7 +4095,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -3360,15 +4184,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -3379,8 +4204,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathly/aclocal.m4 b/tests/rpathly/aclocal.m4 index 297583801..c14bba9aa 100644 --- a/tests/rpathly/aclocal.m4 +++ b/tests/rpathly/aclocal.m4 @@ -1195,7 +1195,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -1226,6 +1226,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathly/configure b/tests/rpathly/configure index 40291c8a6..11746cc20 100755 --- a/tests/rpathly/configure +++ b/tests/rpathly/configure @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# 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 -# 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" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -55,24 +215,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +237,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -94,9 +251,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +263,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBRPATHY LTLIBRPATHY global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -144,13 +312,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +444,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +623,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +635,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +663,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,13 +689,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -560,7 +735,7 @@ ac_cv_env_CPPFLAGS_value=$CPPFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -695,31 +890,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -738,51 +933,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -796,21 +1036,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -823,6 +1095,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -834,9 +1133,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:837: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -845,7 +1144,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:848: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -853,7 +1152,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:856: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -869,42 +1168,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:872: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:876: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:882: 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:884: 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:886: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:905: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:907: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -915,26 +1214,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:930: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -953,7 +1249,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -973,43 +1269,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:976: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1022,7 +1323,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1025: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1033,7 +1334,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1036: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1057,7 +1358,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1060: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1070,13 +1371,13 @@ then # Ok. : else - { { echo "$as_me:1073: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1079: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1091,6 +1392,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1101,15 +1403,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1112: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1117,41 +1419,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1127: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1135: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1138: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1145: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1162,11 +1467,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1165: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1169: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1181,6 +1486,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1189,6 +1495,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1199,10 +1508,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1205: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1211,13 +1521,15 @@ fi PACKAGE=gettext_rpathly VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1230,18 +1542,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1259,7 +1577,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1262: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1267,25 +1585,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1277: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1285: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1288: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1294,7 +1615,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1297: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1302,25 +1623,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1312: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1320: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1323: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1333,7 +1657,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1336: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1341,25 +1665,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1351: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1359: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1362: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1368,7 +1695,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1371: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1376,25 +1703,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1386: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1394: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1397: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1407,7 +1737,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1410: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1416,19 +1746,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1430: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1440,19 +1773,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1452: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1455: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1463,7 +1794,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1466: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1471,25 +1802,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1481: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1489: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1492: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1502,7 +1836,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1505: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1510,25 +1844,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1520: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1528: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1531: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1540,33 +1877,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1548:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1551: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1554: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1556: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1559: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1561: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1564: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1568 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1577,100 +1921,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1584: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1613: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1619: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1624: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1630: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1633: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1640: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1648: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1655: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1657: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1660: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1662: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1678,26 +2042,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1681: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1687: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1693: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1699 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1708,40 +2078,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1714: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1726: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1733: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1737: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1743 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1755,41 +2132,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1761: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1764: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1767: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1779: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1785: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1791 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1800,26 +2182,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1806: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1809: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1812: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1822: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1836,6 +2219,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1846,16 +2325,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1852: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1855: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1858: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1867,8 +2346,12 @@ if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1870 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -1880,27 +2363,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1886: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1889: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1892: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1902 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -1911,21 +2399,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1917: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1920: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1923: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -1938,7 +2427,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -1947,7 +2437,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -1955,7 +2445,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:1958: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -1982,13 +2472,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:1985: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:1991: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2050,10 +2542,12 @@ else fi fi -echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -2071,11 +2565,11 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5 + { { 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:2078: checking build system type" >&5 +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 @@ -2084,23 +2578,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2087: error: cannot guess build type; you must specify one" >&5 + { { 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:2091: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2096: result: $ac_cv_build" >&5 +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:2103: checking host system type" >&5 + +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 @@ -2109,18 +2604,20 @@ else 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:2112: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2117: result: $ac_cv_host" >&5 +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" @@ -2128,10 +2625,23 @@ if test "${with_gnu_ld+set}" = set; then 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:2134: checking for ld used by GCC" >&5 + 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*) @@ -2161,10 +2671,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2164: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2167: checking for non-GNU ld" >&5 + 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 @@ -2194,16 +2704,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2197: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2200: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5 +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:2206: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -2215,11 +2725,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:2222: checking for shared library run path origin" >&5 + + + 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 @@ -2232,7 +2744,7 @@ else acl_cv_rpath=done fi -echo "$as_me:2235: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -2251,12 +2763,19 @@ else enable_rpath=yes fi; - echo "$as_me:2254: checking how to link with librpathy" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathy" >&5 echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6 if test "${ac_cv_librpathy_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2270,6 +2789,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given. if test "${with_librpathy_prefix+set}" = set; then withval="$with_librpathy_prefix" @@ -2637,7 +3157,7 @@ fi; ac_cv_librpathy_cppflags="$INCRPATHY" fi -echo "$as_me:2640: result: $ac_cv_librpathy_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" @@ -2665,9 +3185,14 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 fi done + + HAVE_LIBRPATHY=yes -ac_config_files="$ac_config_files Makefile" + + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -2678,7 +3203,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -2713,7 +3238,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -2749,7 +3274,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -2763,7 +3288,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -2774,35 +3299,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -2828,24 +3546,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -2854,10 +3568,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -2877,7 +3615,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -2887,6 +3625,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -2899,12 +3638,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -2913,9 +3652,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -2925,30 +3664,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:2951: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -2958,16 +3697,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:2970: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -2979,25 +3721,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -3005,16 +3745,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3029,6 +3771,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -3037,23 +3782,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -3066,6 +3811,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -3081,19 +3832,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -3135,11 +3880,13 @@ s,@host_os@,$host_os,;t t s,@LIBRPATHY@,$LIBRPATHY,;t t s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -3178,8 +3925,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -3193,7 +3940,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -3204,60 +3952,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:3252: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -3267,7 +4039,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5 + 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;; @@ -3280,23 +4052,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3283: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -3308,8 +4086,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -3317,7 +4095,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -3360,15 +4184,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -3379,8 +4204,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathlyx/aclocal.m4 b/tests/rpathlyx/aclocal.m4 index 297583801..c14bba9aa 100644 --- a/tests/rpathlyx/aclocal.m4 +++ b/tests/rpathlyx/aclocal.m4 @@ -1195,7 +1195,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -1226,6 +1226,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathlyx/configure b/tests/rpathlyx/configure index 039b01adf..f3b8280ed 100755 --- a/tests/rpathlyx/configure +++ b/tests/rpathlyx/configure @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# 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 -# 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" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -55,24 +215,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +237,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -94,9 +251,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +263,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBRPATHX LTLIBRPATHX LIBRPATHY LTLIBRPATHY global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -144,13 +312,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +444,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +623,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +635,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +663,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,13 +689,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -560,7 +735,7 @@ ac_cv_env_CPPFLAGS_value=$CPPFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -697,31 +892,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -740,51 +935,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -798,21 +1038,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -825,6 +1097,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -836,9 +1135,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:839: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -847,7 +1146,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:850: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -855,7 +1154,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:858: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -871,42 +1170,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:874: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:878: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:884: 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:886: 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:888: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:907: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:909: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -917,26 +1216,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:929: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:932: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -955,7 +1251,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:958: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -975,43 +1271,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:978: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1024,7 +1325,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1027: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1035,7 +1336,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1038: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1059,7 +1360,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1062: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1072,13 +1373,13 @@ then # Ok. : else - { { echo "$as_me:1075: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1081: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1093,6 +1394,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1103,15 +1405,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1106: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1114: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1119,41 +1421,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1129: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1137: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1140: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1147: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1164,11 +1469,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1167: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1171: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1183,6 +1488,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1191,6 +1497,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1201,10 +1510,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1207: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1213,13 +1523,15 @@ fi PACKAGE=gettext_rpathlyx VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1232,18 +1544,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1261,7 +1579,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1264: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1269,25 +1587,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1279: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1287: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1290: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1296,7 +1617,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1299: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1304,25 +1625,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1314: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1322: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1325: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1335,7 +1659,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1338: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1343,25 +1667,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1353: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1361: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1364: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1370,7 +1697,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1373: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1378,25 +1705,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1388: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1396: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1399: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1409,7 +1739,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1412: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1418,19 +1748,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1432: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1442,19 +1775,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1454: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1457: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1465,7 +1796,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1468: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1473,25 +1804,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1483: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1491: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1494: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1504,7 +1838,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1507: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1512,25 +1846,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1522: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1530: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1533: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1542,33 +1879,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1545: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1550:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1553: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1556: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1558: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1561: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1563: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1566: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1570 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1579,100 +1923,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1586: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1589: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1592: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1615: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1621: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1626: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1632: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1635: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1642: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1650: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1657: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1659: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1662: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1664: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1667: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1680,26 +2044,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1683: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1689: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1695: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1701 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1710,40 +2080,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1728: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1735: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1739: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1745 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1757,41 +2134,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1760: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1763: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1766: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1769: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1781: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1787: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1793 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1802,42 +2184,139 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1808: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1811: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1814: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_prog_cc_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -echo "$as_me:1824: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1848,16 +2327,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1854: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1857: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1860: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1869,8 +2348,12 @@ if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1872 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -1882,27 +2365,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1888: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1891: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1894: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1904 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -1913,21 +2401,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1919: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1922: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1925: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -1940,7 +2429,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -1949,7 +2439,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -1957,7 +2447,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:1960: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -1984,13 +2474,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:1987: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:1993: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2052,10 +2544,12 @@ else fi fi -echo "$as_me:2055: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -2073,11 +2567,11 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2076: error: cannot run $ac_config_sub" >&5 + { { 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:2080: checking build system type" >&5 +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 @@ -2086,23 +2580,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2089: error: cannot guess build type; you must specify one" >&5 + { { 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:2093: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2098: result: $ac_cv_build" >&5 +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:2105: checking host system type" >&5 + +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 @@ -2111,18 +2606,20 @@ else 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:2114: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2119: result: $ac_cv_host" >&5 +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" @@ -2130,10 +2627,23 @@ if test "${with_gnu_ld+set}" = set; then 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:2136: checking for ld used by GCC" >&5 + 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*) @@ -2163,10 +2673,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2166: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2169: checking for non-GNU ld" >&5 + 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 @@ -2196,16 +2706,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2199: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2202: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2205: error: no acceptable ld found in \$PATH" >&5 +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:2208: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -2217,11 +2727,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:2220: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:2224: checking for shared library run path origin" >&5 + + + 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 @@ -2234,7 +2746,7 @@ else acl_cv_rpath=done fi -echo "$as_me:2237: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -2253,12 +2765,19 @@ else enable_rpath=yes fi; - echo "$as_me:2256: checking how to link with librpathx" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathx" >&5 echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6 if test "${ac_cv_librpathx_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2272,6 +2791,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given. if test "${with_librpathx_prefix+set}" = set; then withval="$with_librpathx_prefix" @@ -2639,7 +3159,7 @@ fi; ac_cv_librpathx_cppflags="$INCRPATHX" fi -echo "$as_me:2642: result: $ac_cv_librpathx_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" @@ -2667,14 +3187,25 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 fi done + + HAVE_LIBRPATHX=yes - echo "$as_me:2672: checking how to link with librpathy" >&5 + + + + + + + + echo "$as_me:$LINENO: checking how to link with librpathy" >&5 echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6 if test "${ac_cv_librpathy_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2688,6 +3219,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given. if test "${with_librpathy_prefix+set}" = set; then withval="$with_librpathy_prefix" @@ -3055,7 +3587,7 @@ fi; ac_cv_librpathy_cppflags="$INCRPATHY" fi -echo "$as_me:3058: result: $ac_cv_librpathy_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" @@ -3083,11 +3615,15 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 fi done + + HAVE_LIBRPATHY=yes + + LIBRPATHY="$LIBRPATHY $LIBRPATHX" -ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3098,7 +3634,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -3133,7 +3669,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -3169,7 +3705,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -3183,7 +3719,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -3194,35 +3730,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3200: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -3248,24 +3977,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -3274,10 +3999,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -3297,7 +4046,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -3307,6 +4056,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -3319,12 +4069,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -3333,9 +4083,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -3345,30 +4095,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:3371: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -3378,16 +4128,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:3390: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -3399,25 +4152,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -3425,16 +4176,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:3437: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3449,6 +4202,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -3457,23 +4213,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -3486,6 +4242,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -3501,19 +4263,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -3557,11 +4313,13 @@ s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t s,@LIBRPATHY@,$LIBRPATHY,;t t s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -3600,8 +4358,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -3615,7 +4373,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -3626,60 +4385,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:3674: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -3689,7 +4472,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3692: error: cannot find input file: $f" >&5 + 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;; @@ -3702,23 +4485,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3705: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -3730,8 +4519,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -3739,7 +4528,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -3782,15 +4617,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -3801,8 +4637,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathlz/aclocal.m4 b/tests/rpathlz/aclocal.m4 index 297583801..c14bba9aa 100644 --- a/tests/rpathlz/aclocal.m4 +++ b/tests/rpathlz/aclocal.m4 @@ -1195,7 +1195,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -1226,6 +1226,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathlz/configure b/tests/rpathlz/configure index 107bce915..4db2d04bd 100755 --- a/tests/rpathlz/configure +++ b/tests/rpathlz/configure @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# 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 -# 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" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -55,24 +215,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +237,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -94,9 +251,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +263,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBRPATHZ LTLIBRPATHZ global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -144,13 +312,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +444,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +623,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +635,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +663,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,13 +689,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -560,7 +735,7 @@ ac_cv_env_CPPFLAGS_value=$CPPFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -695,31 +890,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -738,51 +933,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -796,21 +1036,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -823,6 +1095,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -834,9 +1133,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:837: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -845,7 +1144,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:848: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -853,7 +1152,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:856: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -869,42 +1168,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:872: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:876: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:882: 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:884: 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:886: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:905: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:907: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -915,26 +1214,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:927: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:930: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -953,7 +1249,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:956: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -973,43 +1269,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:976: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1022,7 +1323,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1025: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1033,7 +1334,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1036: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1057,7 +1358,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1060: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1070,13 +1371,13 @@ then # Ok. : else - { { echo "$as_me:1073: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1079: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1091,6 +1392,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1101,15 +1403,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1104: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1112: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1117,41 +1419,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1127: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1135: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1138: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1145: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1162,11 +1467,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1165: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1169: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1181,6 +1486,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1189,6 +1495,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1199,10 +1508,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1205: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1211,13 +1521,15 @@ fi PACKAGE=gettext_rpathlz VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1230,18 +1542,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1259,7 +1577,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1262: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1267,25 +1585,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1277: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1285: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1288: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1294,7 +1615,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1297: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1302,25 +1623,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1312: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1320: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1323: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1333,7 +1657,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1336: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1341,25 +1665,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1351: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1359: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1362: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1368,7 +1695,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1371: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1376,25 +1703,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1386: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1394: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1397: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1407,7 +1737,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1410: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1416,19 +1746,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1430: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1440,19 +1773,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1452: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1455: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1463,7 +1794,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1466: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1471,25 +1802,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1481: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1489: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1492: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1502,7 +1836,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1505: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1510,25 +1844,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1520: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1528: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1531: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1540,33 +1877,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1543: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1548:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1551: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1554: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1556: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1559: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1561: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1564: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1568 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1577,100 +1921,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1584: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1587: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1613: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1619: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1624: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1630: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1633: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1640: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1648: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1655: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1657: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1660: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1662: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1678,26 +2042,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1681: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1687: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1693: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1699 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1708,40 +2078,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1714: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1726: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1733: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1737: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1743 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1755,41 +2132,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1761: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1764: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1767: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1779: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1785: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1791 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1800,26 +2182,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1806: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1809: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1812: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1822: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1836,6 +2219,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1846,16 +2325,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1852: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1855: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1858: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1867,8 +2346,12 @@ if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1870 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -1880,27 +2363,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1883: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1886: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1889: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1892: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1902 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -1911,21 +2399,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1917: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1920: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1923: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -1938,7 +2427,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -1947,7 +2437,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -1955,7 +2445,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:1958: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -1982,13 +2472,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:1985: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:1991: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2050,10 +2542,12 @@ else fi fi -echo "$as_me:2053: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -2071,11 +2565,11 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2074: error: cannot run $ac_config_sub" >&5 + { { 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:2078: checking build system type" >&5 +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 @@ -2084,23 +2578,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2087: error: cannot guess build type; you must specify one" >&5 + { { 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:2091: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2096: result: $ac_cv_build" >&5 +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:2103: checking host system type" >&5 + +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 @@ -2109,18 +2604,20 @@ else 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:2112: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2117: result: $ac_cv_host" >&5 +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" @@ -2128,10 +2625,23 @@ if test "${with_gnu_ld+set}" = set; then 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:2134: checking for ld used by GCC" >&5 + 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*) @@ -2161,10 +2671,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2164: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2167: checking for non-GNU ld" >&5 + 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 @@ -2194,16 +2704,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2197: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2200: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2203: error: no acceptable ld found in \$PATH" >&5 +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:2206: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -2215,11 +2725,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:2218: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:2222: checking for shared library run path origin" >&5 + + + 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 @@ -2232,7 +2744,7 @@ else acl_cv_rpath=done fi -echo "$as_me:2235: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -2251,12 +2763,19 @@ else enable_rpath=yes fi; - echo "$as_me:2254: checking how to link with librpathz" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathz" >&5 echo $ECHO_N "checking how to link with librpathz... $ECHO_C" >&6 if test "${ac_cv_librpathz_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2270,6 +2789,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathz-prefix or --without-librpathz-prefix was given. if test "${with_librpathz_prefix+set}" = set; then withval="$with_librpathz_prefix" @@ -2637,7 +3157,7 @@ fi; ac_cv_librpathz_cppflags="$INCRPATHZ" fi -echo "$as_me:2640: result: $ac_cv_librpathz_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathz_libs" >&5 echo "${ECHO_T}$ac_cv_librpathz_libs" >&6 LIBRPATHZ="$ac_cv_librpathz_libs" LTLIBRPATHZ="$ac_cv_librpathz_ltlibs" @@ -2665,9 +3185,14 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6 fi done + + HAVE_LIBRPATHZ=yes -ac_config_files="$ac_config_files Makefile" + + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -2678,7 +3203,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -2713,7 +3238,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -2749,7 +3274,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -2763,7 +3288,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -2774,35 +3299,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:2780: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -2828,24 +3546,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -2854,10 +3568,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -2877,7 +3615,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -2887,6 +3625,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -2899,12 +3638,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -2913,9 +3652,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -2925,30 +3664,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:2951: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -2958,16 +3697,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:2970: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -2979,25 +3721,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -3005,16 +3745,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:3017: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3029,6 +3771,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -3037,23 +3782,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -3066,6 +3811,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -3081,19 +3832,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -3135,11 +3880,13 @@ s,@host_os@,$host_os,;t t s,@LIBRPATHZ@,$LIBRPATHZ,;t t s,@LTLIBRPATHZ@,$LTLIBRPATHZ,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -3178,8 +3925,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -3193,7 +3940,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -3204,60 +3952,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:3252: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -3267,7 +4039,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:3270: error: cannot find input file: $f" >&5 + 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;; @@ -3280,23 +4052,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:3283: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -3308,8 +4086,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -3317,7 +4095,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -3360,15 +4184,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -3379,8 +4204,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathlzyx/aclocal.m4 b/tests/rpathlzyx/aclocal.m4 index 297583801..c14bba9aa 100644 --- a/tests/rpathlzyx/aclocal.m4 +++ b/tests/rpathlzyx/aclocal.m4 @@ -1195,7 +1195,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -1226,6 +1226,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathlzyx/configure b/tests/rpathlzyx/configure index 49e806956..803867248 100755 --- a/tests/rpathlzyx/configure +++ b/tests/rpathlzyx/configure @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# 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 -# 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" -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -55,24 +215,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -81,7 +237,8 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -94,9 +251,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -104,7 +263,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBRPATHX LTLIBRPATHX LIBRPATHY LTLIBRPATHY LIBRPATHZ LTLIBRPATHZ global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -144,13 +312,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -283,7 +444,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -462,7 +623,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -474,18 +635,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -501,13 +663,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -517,13 +689,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -560,7 +735,7 @@ ac_cv_env_CPPFLAGS_value=$CPPFLAGS if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -699,31 +894,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -742,51 +937,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -800,21 +1040,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -827,6 +1099,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -838,9 +1137,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:841: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -849,7 +1148,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:852: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -857,7 +1156,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:860: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -873,42 +1172,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:876: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:880: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:886: 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:888: 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:890: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:909: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:911: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -919,26 +1218,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:931: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:934: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -957,7 +1253,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:960: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -977,43 +1273,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:980: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1026,7 +1327,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1029: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1037,7 +1338,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1040: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1061,7 +1362,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1064: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1074,13 +1375,13 @@ then # Ok. : else - { { echo "$as_me:1077: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1083: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1095,6 +1396,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1105,15 +1407,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1108: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1116: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1121,41 +1423,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1131: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1139: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1142: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1149: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1166,11 +1471,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1169: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1173: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1185,6 +1490,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1193,6 +1499,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1203,10 +1512,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1209: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1215,13 +1525,15 @@ fi PACKAGE=gettext_rpathlzyx VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1234,18 +1546,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1263,7 +1581,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1266: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1271,25 +1589,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1281: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1289: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1292: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1298,7 +1619,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1301: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1306,25 +1627,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1316: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1324: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1327: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1337,7 +1661,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1340: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1345,25 +1669,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1355: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1363: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1366: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1372,7 +1699,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1375: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1380,25 +1707,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1390: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1398: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1401: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1411,7 +1741,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1414: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1420,19 +1750,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1434: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1444,19 +1777,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1456: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1459: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1467,7 +1798,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1470: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1475,25 +1806,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1485: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1493: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1496: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1506,7 +1840,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1509: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1514,25 +1848,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1524: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1532: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1535: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1544,33 +1881,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1547: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1552:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1555: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1558: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1560: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1563: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1565: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1568: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1572 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1581,100 +1925,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1588: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1591: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1594: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1617: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1623: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1628: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1634: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1637: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1644: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1652: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1659: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1661: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1664: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1666: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1669: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1682,26 +2046,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1685: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1691: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1697: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1703 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1712,40 +2082,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1718: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1730: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1737: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1741: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1747 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1759,41 +2136,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1762: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1765: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1768: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1771: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1783: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1789: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1795 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1804,26 +2186,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1807: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1810: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1813: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1816: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1826: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1840,6 +2223,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1850,16 +2329,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1853: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1856: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1859: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1862: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1871,8 +2350,12 @@ if { (eval echo "$as_me:1853: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1874 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -1884,27 +2367,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1887: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1890: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1893: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1896: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1906 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -1915,21 +2403,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1918: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1921: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1924: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1927: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -1942,7 +2431,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -1951,7 +2441,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -1959,7 +2449,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:1962: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -1986,13 +2476,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:1989: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:1995: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2054,10 +2546,12 @@ else fi fi -echo "$as_me:2057: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -2075,11 +2569,11 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2078: error: cannot run $ac_config_sub" >&5 + { { 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:2082: checking build system type" >&5 +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 @@ -2088,23 +2582,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2091: error: cannot guess build type; you must specify one" >&5 + { { 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:2095: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2100: result: $ac_cv_build" >&5 +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:2107: checking host system type" >&5 + +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 @@ -2113,18 +2608,20 @@ else 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:2116: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2121: result: $ac_cv_host" >&5 +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" @@ -2132,10 +2629,23 @@ if test "${with_gnu_ld+set}" = set; then 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:2138: checking for ld used by GCC" >&5 + 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*) @@ -2165,10 +2675,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2168: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2171: checking for non-GNU ld" >&5 + 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 @@ -2198,16 +2708,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2201: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2204: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2207: error: no acceptable ld found in \$PATH" >&5 +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:2210: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -2219,11 +2729,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:2222: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:2226: checking for shared library run path origin" >&5 + + + 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 @@ -2236,7 +2748,7 @@ else acl_cv_rpath=done fi -echo "$as_me:2239: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -2255,12 +2767,19 @@ else enable_rpath=yes fi; - echo "$as_me:2258: checking how to link with librpathx" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathx" >&5 echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6 if test "${ac_cv_librpathx_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2274,6 +2793,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given. if test "${with_librpathx_prefix+set}" = set; then withval="$with_librpathx_prefix" @@ -2641,7 +3161,7 @@ fi; ac_cv_librpathx_cppflags="$INCRPATHX" fi -echo "$as_me:2644: result: $ac_cv_librpathx_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" @@ -2669,14 +3189,25 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 fi done + + HAVE_LIBRPATHX=yes - echo "$as_me:2674: checking how to link with librpathy" >&5 + + + + + + + + echo "$as_me:$LINENO: checking how to link with librpathy" >&5 echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6 if test "${ac_cv_librpathy_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -2690,6 +3221,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given. if test "${with_librpathy_prefix+set}" = set; then withval="$with_librpathy_prefix" @@ -3057,7 +3589,7 @@ fi; ac_cv_librpathy_cppflags="$INCRPATHY" fi -echo "$as_me:3060: result: $ac_cv_librpathy_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" @@ -3085,14 +3617,25 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 fi done + + HAVE_LIBRPATHY=yes - echo "$as_me:3090: checking how to link with librpathz" >&5 + + + + + + + + echo "$as_me:$LINENO: checking how to link with librpathz" >&5 echo $ECHO_N "checking how to link with librpathz... $ECHO_C" >&6 if test "${ac_cv_librpathz_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -3106,6 +3649,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathz-prefix or --without-librpathz-prefix was given. if test "${with_librpathz_prefix+set}" = set; then withval="$with_librpathz_prefix" @@ -3473,7 +4017,7 @@ fi; ac_cv_librpathz_cppflags="$INCRPATHZ" fi -echo "$as_me:3476: result: $ac_cv_librpathz_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathz_libs" >&5 echo "${ECHO_T}$ac_cv_librpathz_libs" >&6 LIBRPATHZ="$ac_cv_librpathz_libs" LTLIBRPATHZ="$ac_cv_librpathz_ltlibs" @@ -3501,11 +4045,15 @@ echo "${ECHO_T}$ac_cv_librpathz_libs" >&6 fi done + + HAVE_LIBRPATHZ=yes + + LIBRPATHZ="$LIBRPATHZ $LIBRPATHY $LIBRPATHX" -ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3516,7 +4064,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -3551,7 +4099,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -3587,7 +4135,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -3601,7 +4149,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -3612,35 +4160,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3618: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -3666,24 +4407,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -3692,10 +4429,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -3715,7 +4476,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -3725,6 +4486,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -3737,12 +4499,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -3751,9 +4513,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -3763,30 +4525,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:3789: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -3796,16 +4558,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:3808: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -3817,25 +4582,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -3843,16 +4606,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:3855: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -3867,6 +4632,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -3875,23 +4643,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -3904,6 +4672,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -3919,19 +4693,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -3977,11 +4745,13 @@ s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t s,@LIBRPATHZ@,$LIBRPATHZ,;t t s,@LTLIBRPATHZ@,$LTLIBRPATHZ,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -4020,8 +4790,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -4035,7 +4805,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -4046,60 +4817,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:4094: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -4109,7 +4904,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4112: error: cannot find input file: $f" >&5 + 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;; @@ -4122,23 +4917,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4125: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -4150,8 +4951,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -4159,7 +4960,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -4202,15 +5049,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -4221,8 +5069,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathx/aclocal.m4 b/tests/rpathx/aclocal.m4 index 39c401c6b..792dc75bf 100644 --- a/tests/rpathx/aclocal.m4 +++ b/tests/rpathx/aclocal.m4 @@ -523,6 +523,8 @@ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl +AC_REQUIRE([LT_AC_PROG_SED])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl @@ -690,9 +692,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; solaris* | sysv5*) symcode='[[BDT]]' ;; @@ -789,7 +794,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -1333,7 +1338,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -1376,7 +1381,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -1433,11 +1438,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -1802,7 +1803,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -1811,6 +1812,7 @@ EOF set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -1923,10 +1925,12 @@ else # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -2040,8 +2044,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -2093,13 +2098,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -2127,7 +2133,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -2137,7 +2143,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -2249,13 +2255,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -2396,6 +2412,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -2434,6 +2453,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -2481,7 +2501,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' @@ -2576,14 +2596,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -2687,11 +2710,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -2734,6 +2758,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -2890,7 +2920,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -2952,8 +2982,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -3714,7 +3747,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], +[AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -3789,9 +3822,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -3813,7 +3846,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3884,6 +3917,9 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac @@ -3949,12 +3985,12 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for +# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not +# configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with +# with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3966,16 +4002,18 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for +# the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3993,12 +4031,14 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" - INCLTDL= + LTDLINCL= fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # old names @@ -4013,3 +4053,92 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" +]) +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +AC_MSG_RESULT([$SED]) +]) + diff --git a/tests/rpathx/configure b/tests/rpathx/configure index 7a073caae..58ddd2934 100755 --- a/tests/rpathx/configure +++ b/tests/rpathx/configure @@ -1,11 +1,244 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -18,6 +251,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -163,81 +397,7 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# 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" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +410,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,7 +422,53 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -300,13 +508,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -439,7 +640,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -618,7 +819,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -630,18 +831,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -657,13 +859,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -673,13 +885,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -720,7 +935,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -858,31 +1093,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -901,51 +1136,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -959,21 +1239,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -986,6 +1298,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -997,9 +1336,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1000: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1008,7 +1347,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1011: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1016,7 +1355,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1019: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1032,42 +1371,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1035: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1039: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1045: 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:1047: 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:1049: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1068: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1070: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1078,26 +1417,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1090: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1093: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -1116,7 +1452,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1119: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1136,43 +1472,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1139: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1185,7 +1526,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1188: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1196,7 +1537,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1199: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1220,7 +1561,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1223: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1233,13 +1574,13 @@ then # Ok. : else - { { echo "$as_me:1236: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1242: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1254,6 +1595,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1264,15 +1606,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1267: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1275: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1280,41 +1622,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1290: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1298: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1301: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1308: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1325,11 +1670,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1328: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1332: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1344,6 +1689,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1352,6 +1698,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1362,10 +1711,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1368: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1374,13 +1724,15 @@ fi PACKAGE=gettext_rpathx VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1393,18 +1745,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1422,7 +1780,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1425: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1430,25 +1788,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1440: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1448: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1451: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1457,7 +1818,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1460: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1465,25 +1826,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1475: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1483: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1486: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1496,7 +1860,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1499: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1504,25 +1868,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1514: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1522: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1525: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1531,7 +1898,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1534: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1539,25 +1906,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1549: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1557: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1560: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1570,7 +1940,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1573: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1579,19 +1949,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1593: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1603,19 +1976,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1615: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1618: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1626,7 +1997,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1629: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1634,25 +2005,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1644: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1652: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1655: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1665,7 +2039,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1668: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1673,25 +2047,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1683: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1691: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1694: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1703,33 +2080,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1706: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1711:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1714: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1717: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1719: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1724: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1727: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1731 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1740,100 +2124,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1747: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1750: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1753: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1776: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1782: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1787: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1793: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1796: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1803: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1811: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1818: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1820: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1823: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1825: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1841,26 +2245,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1844: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1850: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1856: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1862 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1871,40 +2281,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1874: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1877: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1889: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1896: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1900: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1906 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1918,41 +2335,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1921: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1924: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1927: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1930: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1942: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1948: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1954 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1963,26 +2385,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1969: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1972: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1975: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1985: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1999,6 +2422,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2009,16 +2528,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2015: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2018: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2021: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2030,8 +2549,12 @@ if { (eval echo "$as_me:2012: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2033 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2043,27 +2566,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2049: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2052: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2055: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2065 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2074,21 +2602,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2077: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2080: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2083: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2086: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2101,7 +2630,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2110,7 +2640,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2118,7 +2648,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:2121: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -2145,13 +2675,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:2148: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:2154: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2213,10 +2745,11 @@ else fi fi -echo "$as_me:2216: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -2285,11 +2818,11 @@ else fi; # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2288: error: cannot run $ac_config_sub" >&5 + { { 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:2292: checking build system type" >&5 +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 @@ -2298,23 +2831,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2301: error: cannot guess build type; you must specify one" >&5 + { { 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:2305: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2310: result: $ac_cv_build" >&5 +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:2317: checking host system type" >&5 + +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 @@ -2323,18 +2857,19 @@ else 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:2326: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2331: result: $ac_cv_host" >&5 +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/'` + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. if test "X${PATH_SEPARATOR+set}" != Xset; then @@ -2346,6 +2881,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -2356,7 +2892,7 @@ fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:2359: checking for ld used by GCC" >&5 + 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*) @@ -2386,10 +2922,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2389: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2392: checking for non-GNU ld" >&5 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -2419,16 +2955,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2422: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2425: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2428: error: no acceptable ld found in \$PATH" >&5 +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:2431: checking if the linker ($LD) is GNU ld" >&5 +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 "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2440,23 +2976,24 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:2443: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:2447: checking for $LD option to reload object files" >&5 + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:2454: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:2459: checking for BSD-compatible nm" >&5 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2492,22 +3029,107 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:2495: result: $NM" >&5 +echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:2498: checking whether ln -s works" >&5 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" + +fi + +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 + +echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2502: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2505: result: no, using $LN_S" >&5 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2509: checking how to recognise dependant libraries" >&5 -echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2584,9 +3206,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -2608,7 +3230,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -2679,18 +3301,28 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac fi -echo "$as_me:2687: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:2693: checking command to parse $NM output" >&5 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2726,9 +3358,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[BCDEGRST]' ;; +osf*) + symcode='[BCDEGQRST]' + ;; solaris* | sysv5*) symcode='[BDT]' ;; @@ -2771,17 +3406,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:2774: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2777: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:2781: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:2784: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -2833,11 +3468,11 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:2836: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2839: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2877,10 +3512,10 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:2880: result: failed" >&5 + echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:2883: result: ok" >&5 + echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi @@ -2889,7 +3524,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2892: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2910,18 +3545,22 @@ 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 2913 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:2918: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2924: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2935,7 +3574,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -2944,17 +3584,21 @@ 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 2947 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:2951: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2957: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2969,7 +3613,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -2991,7 +3636,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2994: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3001,18 +3646,22 @@ 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 3004 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:3009: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3015: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3026,7 +3675,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -3035,17 +3685,21 @@ 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 3038 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:3042: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3048: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3060,7 +3714,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -3073,8 +3728,10 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:3076: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -3084,26 +3741,313 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_header in dlfcn.h + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +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. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3090: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3096 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3100: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3106: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3114,29 +4058,80 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3125: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:3139: checking for ${ac_tool_prefix}file" >&5 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3191,16 +4186,16 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3194: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3197: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:3203: checking for file" >&5 + echo "$as_me:$LINENO: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3255,10 +4250,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3258: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3261: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3274,7 +4269,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3277: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3282,25 +4277,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3292: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3300: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3303: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3309,7 +4307,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3312: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3317,15 +4315,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3327: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -3333,10 +4334,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3336: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3339: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3348,7 +4349,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:3351: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3356,25 +4357,28 @@ else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:3366: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:3374: result: $STRIP" >&5 + echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:3377: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3383,7 +4387,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:3386: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3391,15 +4395,18 @@ else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:3401: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" @@ -3407,10 +4414,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:3410: result: $ac_ct_STRIP" >&5 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:3413: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3419,6 +4426,7 @@ else STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no enable_win32_dll=no @@ -3434,11 +4442,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3437 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:3438: \"$ac_compile\"") >&5 + echo '#line 4445 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3441: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -3459,12 +4467,13 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:3462: checking whether the C compiler needs -belf" >&5 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3472,8 +4481,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 3475 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3484,21 +4497,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3487: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3490: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3493: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3496: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3509,7 +4523,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:3512: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -3517,6 +4531,7 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 fi ;; + esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -3609,7 +4624,7 @@ fi set dummy $CC compiler="$2" -echo "$as_me:3612: checking for objdir" >&5 +echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -3620,9 +4635,11 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:3623: result: $objdir" >&5 +echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" @@ -3635,7 +4652,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:3638: checking for $compiler option to produce PIC" >&5 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3667,7 +4684,7 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -3710,7 +4727,7 @@ else lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -3767,11 +4784,7 @@ else sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -3795,14 +4808,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:3798: result: none" >&5 + echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:3801: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:3805: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3810,8 +4823,12 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 3813 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3822,16 +4839,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3825: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3828: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3831: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3834: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -3851,7 +4868,8 @@ if { (eval echo "$as_me:3825: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no fi @@ -3860,6 +4878,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no @@ -3867,23 +4886,23 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:3870: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:3876: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:3880: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:3886: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3892,8 +4911,12 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 3895 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3904,30 +4927,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3907: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3910: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3913: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3916: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:3930: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -3937,8 +4962,9 @@ link_static_flag="$lt_cv_prog_cc_static" no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:3941: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3958,7 +4984,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3982,12 +5008,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:3985: result: $compiler_c_o" >&5 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:3990: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3999,8 +5025,12 @@ else save_objext="$ac_objext" ac_objext=lo cat >conftest.$ac_ext <<_ACEOF -#line 4002 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4011,16 +5041,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4017: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4020: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4023: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4032,7 +5062,8 @@ if { (eval echo "$as_me:4014: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" @@ -4041,7 +5072,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:4044: result: $compiler_o_lo" >&5 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no @@ -4051,7 +5082,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:4054: checking if we can lock with hard links" >&5 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -4059,10 +5090,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:4062: result: $hard_links" >&5 + echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:4065: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -4072,15 +5103,19 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:4075: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 4082 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4091,16 +5126,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4097: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4100: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4103: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4112,11 +5147,12 @@ if { (eval echo "$as_me:4094: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:4119: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -4127,7 +5163,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:4130: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -4284,7 +5320,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -4293,6 +5329,7 @@ EOF set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -4405,10 +5442,12 @@ else # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -4522,8 +5561,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -4575,13 +5615,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -4609,7 +5650,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -4619,7 +5660,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -4731,13 +5772,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -4807,12 +5858,12 @@ EOF ;; esac fi -echo "$as_me:4810: result: $ld_shlibs" >&5 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:4815: checking how to hardcode library paths into programs" >&5 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -4836,20 +5887,20 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:4839: result: $hardcode_action" >&5 +echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo "$as_me:4844: checking whether stripping libraries is possible" >&5 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:4849: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:4852: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4857,7 +5908,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics -echo "$as_me:4860: checking dynamic linker characteristics" >&5 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -4885,6 +5936,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -4923,6 +5977,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -4970,7 +6025,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' @@ -5065,14 +6120,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -5176,11 +6234,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -5223,6 +6282,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -5262,17 +6327,17 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:5265: result: $dynamic_linker" >&5 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:5270: checking if libtool supports shared libraries" >&5 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:5272: result: $can_build_shared" >&5 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:5275: checking whether to build shared libraries" >&5 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 test "$can_build_shared" = "no" && enable_shared=no @@ -5293,14 +6358,14 @@ aix4*) fi ;; esac -echo "$as_me:5296: result: $enable_shared" >&5 +echo "$as_me:$LINENO: result: $enable_shared" >&5 echo "${ECHO_T}$enable_shared" >&6 -echo "$as_me:5299: checking whether to build static libraries" >&5 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:5303: result: $enable_static" >&5 +echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then @@ -5338,25 +6403,40 @@ else ;; *) - echo "$as_me:5341: checking for shl_load" >&5 + echo "$as_me:$LINENO: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5347 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus -extern "C" +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shl_load (); -char (*f) (); int main () @@ -5375,31 +6455,32 @@ f = shl_load; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5378: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5381: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5384: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5387: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5397: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:5402: checking for shl_load in -ldld" >&5 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5407,8 +6488,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5410 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5426,50 +6511,66 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5429: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5432: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5435: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5438: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5449: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:5454: checking for dlopen" >&5 + echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5460 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif int main () @@ -5488,31 +6589,32 @@ f = dlopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5494: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5497: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5500: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5510: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:5515: checking for dlopen in -ldl" >&5 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5520,8 +6622,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5523 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5539,32 +6645,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5545: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5548: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5551: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5562: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:5567: checking for dlopen in -lsvld" >&5 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5572,8 +6679,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5575 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5591,32 +6702,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5594: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5597: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5600: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5603: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5614: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:5619: checking for dld_link in -ldld" >&5 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5624,8 +6736,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5627 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5643,40 +6759,46 @@ dld_link (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5646: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5649: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5652: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5655: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5666: result: $ac_cv_lib_dld_dld_link" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + fi + fi + fi + fi + fi ;; @@ -5699,7 +6821,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:5702: checking whether a program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5710,7 +6832,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5777: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5790,13 +6912,14 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5794: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:5799: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5807,7 +6930,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5874: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5887,8 +7010,9 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5891: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -5909,6 +7033,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -5918,7 +7043,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:5921: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5926,10 +7051,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:5929: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5932: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -5943,10 +7068,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:5946: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:5949: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -5961,7 +7086,7 @@ else fi - echo "$as_me:5964: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -5990,7 +7115,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -6052,8 +7177,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6518,6 +7646,10 @@ EOF chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -6526,7 +7658,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion -ac_config_files="$ac_config_files Makefile" + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -6537,7 +7671,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -6572,7 +7706,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -6608,7 +7742,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -6622,7 +7756,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -6633,35 +7767,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:6639: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -6687,24 +8014,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -6713,10 +8036,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -6736,7 +8083,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -6746,6 +8093,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -6758,12 +8106,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -6772,9 +8120,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -6784,30 +8132,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:6810: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -6817,16 +8165,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:6829: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -6838,25 +8189,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -6864,16 +8213,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:6876: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -6888,6 +8239,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -6896,23 +8250,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -6925,6 +8279,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -6940,19 +8300,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -6998,13 +8352,16 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -7043,8 +8400,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -7058,7 +8415,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -7069,60 +8427,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:7117: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -7132,7 +8514,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7135: error: cannot find input file: $f" >&5 + 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;; @@ -7145,23 +8527,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7148: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -7173,8 +8561,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -7182,7 +8570,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -7225,15 +8659,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -7244,8 +8679,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathy/aclocal.m4 b/tests/rpathy/aclocal.m4 index 483a341ba..5feae9ad6 100644 --- a/tests/rpathy/aclocal.m4 +++ b/tests/rpathy/aclocal.m4 @@ -523,6 +523,8 @@ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl +AC_REQUIRE([LT_AC_PROG_SED])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl @@ -690,9 +692,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; solaris* | sysv5*) symcode='[[BDT]]' ;; @@ -789,7 +794,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -1333,7 +1338,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -1376,7 +1381,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -1433,11 +1438,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -1802,7 +1803,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -1811,6 +1812,7 @@ EOF set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -1923,10 +1925,12 @@ else # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -2040,8 +2044,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -2093,13 +2098,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -2127,7 +2133,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -2137,7 +2143,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -2249,13 +2255,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -2396,6 +2412,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -2434,6 +2453,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -2481,7 +2501,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' @@ -2576,14 +2596,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -2687,11 +2710,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -2734,6 +2758,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -2890,7 +2920,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -2952,8 +2982,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -3714,7 +3747,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], +[AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -3789,9 +3822,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -3813,7 +3846,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3884,6 +3917,9 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac @@ -3949,12 +3985,12 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for +# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not +# configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with +# with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3966,16 +4002,18 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for +# the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3993,12 +4031,14 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" - INCLTDL= + LTDLINCL= fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # old names @@ -4013,6 +4053,95 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" +]) +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +AC_MSG_RESULT([$SED]) +]) + # lib-link.m4 serial 3 (gettext-0.11.3) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -4717,7 +4846,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -4748,6 +4877,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathy/configure b/tests/rpathy/configure index af31348de..5c4784457 100755 --- a/tests/rpathy/configure +++ b/tests/rpathy/configure @@ -1,11 +1,244 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -18,6 +251,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -163,81 +397,7 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# 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" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +410,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,7 +422,53 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL LIBRPATHX LTLIBRPATHX global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -300,13 +508,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -439,7 +640,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -618,7 +819,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -630,18 +831,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -657,13 +859,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -673,13 +885,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -720,7 +935,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -861,31 +1096,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -904,51 +1139,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -962,21 +1242,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -989,6 +1301,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -1000,9 +1339,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1003: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1011,7 +1350,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1014: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1019,7 +1358,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1022: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1035,42 +1374,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1038: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1042: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1048: 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:1050: 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:1052: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1071: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1073: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1081,26 +1420,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1093: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1096: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -1119,7 +1455,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1122: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1139,43 +1475,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1142: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1188,7 +1529,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1191: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1199,7 +1540,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1202: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1223,7 +1564,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1226: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1236,13 +1577,13 @@ then # Ok. : else - { { echo "$as_me:1239: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1245: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1257,6 +1598,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1267,15 +1609,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1270: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1278: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1283,41 +1625,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1293: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1301: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1304: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1311: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1328,11 +1673,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1331: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1335: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1347,6 +1692,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1355,6 +1701,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1365,10 +1714,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1371: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1377,13 +1727,15 @@ fi PACKAGE=gettext_rpathy VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1396,18 +1748,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1425,7 +1783,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1428: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1433,25 +1791,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1443: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1451: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1454: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1460,7 +1821,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1463: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1468,25 +1829,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1478: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1486: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1489: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1499,7 +1863,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1502: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1507,25 +1871,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1517: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1525: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1528: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1534,7 +1901,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1537: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1542,25 +1909,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1552: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1560: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1563: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1573,7 +1943,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1576: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1582,19 +1952,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1596: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1606,19 +1979,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1618: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1621: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1629,7 +2000,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1632: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1637,25 +2008,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1647: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1655: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1658: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1668,7 +2042,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1671: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1676,25 +2050,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1686: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1694: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1697: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1706,33 +2083,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1709: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1714:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1717: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1720: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1722: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1725: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1727: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1730: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1734 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1743,100 +2127,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1750: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1753: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1756: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1779: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1785: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1790: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1796: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1799: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1806: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1814: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1821: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1823: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1826: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1828: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1831: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1844,26 +2248,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1847: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1853: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1859: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1865 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1874,40 +2284,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1877: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1880: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1892: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1899: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1903: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1909 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1921,41 +2338,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1927: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1930: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1933: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1945: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1951: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1957 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1966,26 +2388,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1969: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1972: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1975: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1978: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1988: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2002,6 +2425,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2012,16 +2531,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2018: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2021: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2024: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2033,8 +2552,12 @@ if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2036 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2046,27 +2569,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2049: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2052: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2055: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2058: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2068 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2077,21 +2605,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2080: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2083: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2086: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2089: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2104,7 +2633,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2113,7 +2643,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2121,7 +2651,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:2124: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -2148,13 +2678,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:2151: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:2157: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2216,10 +2748,11 @@ else fi fi -echo "$as_me:2219: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -2288,11 +2821,11 @@ else fi; # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2291: error: cannot run $ac_config_sub" >&5 + { { 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:2295: checking build system type" >&5 +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 @@ -2301,23 +2834,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2304: error: cannot guess build type; you must specify one" >&5 + { { 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:2308: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2313: result: $ac_cv_build" >&5 +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:2320: checking host system type" >&5 + +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 @@ -2326,18 +2860,19 @@ else 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:2329: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2334: result: $ac_cv_host" >&5 +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/'` + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. if test "X${PATH_SEPARATOR+set}" != Xset; then @@ -2349,6 +2884,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -2359,7 +2895,7 @@ fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:2362: checking for ld used by GCC" >&5 + 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*) @@ -2389,10 +2925,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2392: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2395: checking for non-GNU ld" >&5 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -2422,16 +2958,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2425: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2428: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2431: error: no acceptable ld found in \$PATH" >&5 +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:2434: checking if the linker ($LD) is GNU ld" >&5 +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 "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2443,23 +2979,24 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:2446: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:2450: checking for $LD option to reload object files" >&5 + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:2457: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:2462: checking for BSD-compatible nm" >&5 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2495,22 +3032,107 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:2498: result: $NM" >&5 +echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:2501: checking whether ln -s works" >&5 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" + +fi + +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 + +echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2505: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2508: result: no, using $LN_S" >&5 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2512: checking how to recognise dependant libraries" >&5 -echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2587,9 +3209,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -2611,7 +3233,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -2682,18 +3304,28 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac fi -echo "$as_me:2690: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:2696: checking command to parse $NM output" >&5 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2729,9 +3361,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[BCDEGRST]' ;; +osf*) + symcode='[BCDEGQRST]' + ;; solaris* | sysv5*) symcode='[BDT]' ;; @@ -2774,17 +3409,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:2777: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2780: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:2784: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:2787: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -2836,11 +3471,11 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:2839: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2842: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2880,10 +3515,10 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:2883: result: failed" >&5 + echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:2886: result: ok" >&5 + echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi @@ -2892,7 +3527,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2895: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2913,18 +3548,22 @@ 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 2916 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:2921: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2927: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2938,7 +3577,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -2947,17 +3587,21 @@ 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 2950 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:2954: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2960: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2972,7 +3616,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -2994,7 +3639,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2997: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3004,18 +3649,60 @@ 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 3007 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:3012: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3018: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3023,90 +3710,347 @@ if { (eval echo "$as_me:3012: \"$ac_cpp conftest.$ac_ext\"") >&5 ac_cpp_err= fi else - ac_cpp_err=yes + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no fi -if test -z "$ac_cpp_err"; then +rm -f conftest* + +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else cat >conftest.$ac_ext <<_ACEOF -#line 3041 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ _ACEOF -if { (eval echo "$as_me:3045: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3051: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cpp_err=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:3079: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +done + + for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3093: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3099 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3103: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3109: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3117,29 +4061,80 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3128: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:3142: checking for ${ac_tool_prefix}file" >&5 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3194,16 +4189,16 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3197: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3200: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:3206: checking for file" >&5 + echo "$as_me:$LINENO: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3258,10 +4253,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3261: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3264: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3277,7 +4272,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3280: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3285,25 +4280,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3295: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3303: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3306: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3312,7 +4310,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3315: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3320,15 +4318,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3330: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -3336,10 +4337,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3339: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3342: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3351,7 +4352,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:3354: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3359,25 +4360,28 @@ else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:3369: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:3377: result: $STRIP" >&5 + echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:3380: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3386,7 +4390,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:3389: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3394,15 +4398,18 @@ else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:3404: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" @@ -3410,10 +4417,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:3413: result: $ac_ct_STRIP" >&5 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:3416: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3422,6 +4429,7 @@ else STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no enable_win32_dll=no @@ -3437,11 +4445,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3440 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5 + echo '#line 4448 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3444: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -3462,12 +4470,13 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:3465: checking whether the C compiler needs -belf" >&5 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3475,8 +4484,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 3478 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3487,21 +4500,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3490: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3493: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3496: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3499: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3512,7 +4526,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:3515: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -3520,6 +4534,7 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 fi ;; + esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -3612,7 +4627,7 @@ fi set dummy $CC compiler="$2" -echo "$as_me:3615: checking for objdir" >&5 +echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -3623,9 +4638,11 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:3626: result: $objdir" >&5 +echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" @@ -3638,7 +4655,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:3641: checking for $compiler option to produce PIC" >&5 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3670,7 +4687,7 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -3713,7 +4730,7 @@ else lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -3770,11 +4787,7 @@ else sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -3798,14 +4811,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:3801: result: none" >&5 + echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:3804: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:3808: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3813,8 +4826,12 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 3816 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3825,16 +4842,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3828: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3831: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3834: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3837: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -3854,7 +4871,8 @@ if { (eval echo "$as_me:3828: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no fi @@ -3863,6 +4881,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no @@ -3870,23 +4889,23 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:3873: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:3879: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:3883: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:3889: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3895,8 +4914,12 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 3898 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3907,30 +4930,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3910: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3913: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3916: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3919: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:3933: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -3940,8 +4965,9 @@ link_static_flag="$lt_cv_prog_cc_static" no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:3944: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3961,7 +4987,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3985,12 +5011,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:3988: result: $compiler_c_o" >&5 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:3993: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4002,8 +5028,12 @@ else save_objext="$ac_objext" ac_objext=lo cat >conftest.$ac_ext <<_ACEOF -#line 4005 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4014,16 +5044,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4020: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4023: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4026: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4035,7 +5065,8 @@ if { (eval echo "$as_me:4017: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" @@ -4044,7 +5075,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:4047: result: $compiler_o_lo" >&5 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no @@ -4054,7 +5085,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:4057: checking if we can lock with hard links" >&5 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -4062,10 +5093,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:4065: result: $hard_links" >&5 + echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:4068: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -4075,15 +5106,19 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:4078: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 4085 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4094,16 +5129,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4097: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4100: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4103: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4106: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4115,11 +5150,12 @@ if { (eval echo "$as_me:4097: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:4122: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -4130,7 +5166,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:4133: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -4287,7 +5323,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -4296,6 +5332,7 @@ EOF set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -4408,10 +5445,12 @@ else # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -4525,8 +5564,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -4578,13 +5618,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -4612,7 +5653,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -4622,7 +5663,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -4734,13 +5775,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -4810,12 +5861,12 @@ EOF ;; esac fi -echo "$as_me:4813: result: $ld_shlibs" >&5 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:4818: checking how to hardcode library paths into programs" >&5 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -4839,20 +5890,20 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:4842: result: $hardcode_action" >&5 +echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo "$as_me:4847: checking whether stripping libraries is possible" >&5 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:4852: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:4855: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4860,7 +5911,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics -echo "$as_me:4863: checking dynamic linker characteristics" >&5 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -4888,6 +5939,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -4926,6 +5980,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -4973,7 +6028,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' @@ -5068,14 +6123,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -5179,11 +6237,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -5226,6 +6285,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -5265,17 +6330,17 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:5268: result: $dynamic_linker" >&5 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:5273: checking if libtool supports shared libraries" >&5 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:5275: result: $can_build_shared" >&5 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:5278: checking whether to build shared libraries" >&5 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 test "$can_build_shared" = "no" && enable_shared=no @@ -5296,14 +6361,14 @@ aix4*) fi ;; esac -echo "$as_me:5299: result: $enable_shared" >&5 +echo "$as_me:$LINENO: result: $enable_shared" >&5 echo "${ECHO_T}$enable_shared" >&6 -echo "$as_me:5302: checking whether to build static libraries" >&5 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:5306: result: $enable_static" >&5 +echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then @@ -5341,25 +6406,40 @@ else ;; *) - echo "$as_me:5344: checking for shl_load" >&5 + echo "$as_me:$LINENO: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5350 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif int main () @@ -5378,31 +6458,32 @@ f = shl_load; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5381: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5384: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5387: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5390: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5400: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:5405: checking for shl_load in -ldld" >&5 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5410,8 +6491,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5413 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5429,50 +6514,66 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5435: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5438: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5441: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5452: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:5457: checking for dlopen" >&5 + echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5463 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus -extern "C" +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -char (*f) (); int main () @@ -5491,31 +6592,32 @@ f = dlopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5497: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5500: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5503: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5513: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:5518: checking for dlopen in -ldl" >&5 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5523,8 +6625,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5526 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5542,32 +6648,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5548: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5551: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5554: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5565: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:5570: checking for dlopen in -lsvld" >&5 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5575,8 +6682,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5578 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5594,32 +6705,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5600: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5603: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5606: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5617: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:5622: checking for dld_link in -ldld" >&5 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5627,8 +6739,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5630 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5646,40 +6762,46 @@ dld_link (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5649: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5652: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5655: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5658: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5669: result: $ac_cv_lib_dld_dld_link" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + fi + fi + fi + fi + fi ;; @@ -5702,7 +6824,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:5705: checking whether a program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5713,7 +6835,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5780: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5793,13 +6915,14 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5797: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:5802: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5810,7 +6933,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5877: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5890,8 +7013,9 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5894: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -5912,6 +7036,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -5921,7 +7046,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:5924: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5929,10 +7054,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:5932: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5935: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -5946,10 +7071,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:5949: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:5952: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -5964,7 +7089,7 @@ else fi - echo "$as_me:5967: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -5993,7 +7118,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -6055,8 +7180,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6521,6 +7649,10 @@ EOF chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -6529,6 +7661,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -6544,6 +7678,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -6551,10 +7686,23 @@ if test "${with_gnu_ld+set}" = set; then 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:6557: checking for ld used by GCC" >&5 + 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*) @@ -6584,10 +7732,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:6587: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:6590: checking for non-GNU ld" >&5 + 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 @@ -6617,16 +7765,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:6620: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:6623: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:6626: error: no acceptable ld found in \$PATH" >&5 +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:6629: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -6638,11 +7786,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:6641: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:6645: checking for shared library run path origin" >&5 + + + 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 @@ -6655,7 +7805,7 @@ else acl_cv_rpath=done fi -echo "$as_me:6658: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -6674,12 +7824,19 @@ else enable_rpath=yes fi; - echo "$as_me:6677: checking how to link with librpathx" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathx" >&5 echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6 if test "${ac_cv_librpathx_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -6693,6 +7850,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given. if test "${with_librpathx_prefix+set}" = set; then withval="$with_librpathx_prefix" @@ -7060,7 +8218,7 @@ fi; ac_cv_librpathx_cppflags="$INCRPATHX" fi -echo "$as_me:7063: result: $ac_cv_librpathx_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" @@ -7088,9 +8246,14 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 fi done + + HAVE_LIBRPATHX=yes -ac_config_files="$ac_config_files Makefile" + + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -7101,7 +8264,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -7136,7 +8299,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -7172,7 +8335,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -7186,7 +8349,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -7197,35 +8360,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:7203: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -7251,24 +8607,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -7277,10 +8629,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -7300,7 +8676,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -7310,6 +8686,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -7322,12 +8699,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -7336,9 +8713,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -7348,30 +8725,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7374: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -7381,16 +8758,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:7393: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -7402,25 +8782,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -7428,16 +8806,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:7440: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7452,6 +8832,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -7460,23 +8843,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -7489,6 +8872,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -7504,19 +8893,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -7562,15 +8945,18 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBRPATHX@,$LIBRPATHX,;t t s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -7609,8 +8995,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -7624,7 +9010,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -7635,60 +9022,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:7683: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -7698,7 +9109,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7701: error: cannot find input file: $f" >&5 + 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;; @@ -7711,23 +9122,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7714: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -7739,8 +9156,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -7748,7 +9165,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -7791,15 +9254,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -7810,8 +9274,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/tests/rpathz/aclocal.m4 b/tests/rpathz/aclocal.m4 index 483a341ba..5feae9ad6 100644 --- a/tests/rpathz/aclocal.m4 +++ b/tests/rpathz/aclocal.m4 @@ -523,6 +523,8 @@ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl +AC_REQUIRE([LT_AC_PROG_SED])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl @@ -690,9 +692,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; solaris* | sysv5*) symcode='[[BDT]]' ;; @@ -789,7 +794,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if AC_TRY_EVAL(ac_link) && test -s conftest; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -1333,7 +1338,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -1376,7 +1381,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -1433,11 +1438,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -1802,7 +1803,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -1811,6 +1812,7 @@ EOF set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -1923,10 +1925,12 @@ else # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -2040,8 +2044,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -2093,13 +2098,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -2127,7 +2133,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -2137,7 +2143,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -2249,13 +2255,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -2396,6 +2412,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -2434,6 +2453,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -2481,7 +2501,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' @@ -2576,14 +2596,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -2687,11 +2710,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -2734,6 +2758,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -2890,7 +2920,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -2952,8 +2982,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -3714,7 +3747,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], +[AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -3789,9 +3822,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -3813,7 +3846,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3884,6 +3917,9 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac @@ -3949,12 +3985,12 @@ esac ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for +# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not +# configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with +# with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3966,16 +4002,18 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for +# the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. @@ -3993,12 +4031,14 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" - INCLTDL= + LTDLINCL= fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ]) # old names @@ -4013,6 +4053,95 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" +]) +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +AC_MSG_RESULT([$SED]) +]) + # lib-link.m4 serial 3 (gettext-0.11.3) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -4717,7 +4846,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-ld.m4 serial 1 (gettext-0.11) +# lib-ld.m4 serial 2 (gettext-0.11.6) dnl Copyright (C) 1996-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 @@ -4748,6 +4877,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/tests/rpathz/configure b/tests/rpathz/configure index 26dba98b3..106d5e043 100755 --- a/tests/rpathz/configure +++ b/tests/rpathz/configure @@ -1,11 +1,244 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.56. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + 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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. @@ -18,6 +251,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -163,81 +397,7 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - -# 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" - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -250,9 +410,11 @@ exec 6>&1 # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -260,7 +422,53 @@ SHELL=${CONFIG_SHELL-/bin/sh} # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_unique_file="configure.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL LIBRPATHX LTLIBRPATHX LIBRPATHY LTLIBRPATHY global_top_srcdir LIBOBJS LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -300,13 +508,6 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_prev= for ac_option do @@ -439,7 +640,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -618,7 +819,7 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -630,18 +831,19 @@ do eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -657,13 +859,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -673,13 +885,16 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -720,7 +935,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -863,31 +1098,31 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.56. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -906,51 +1141,96 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -964,21 +1244,53 @@ trap 'exit_status=$? "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && +} + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + sed "/^$/d" confdefs.h | sort + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -991,6 +1303,33 @@ rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >confdefs.h +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -1002,9 +1341,9 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1005: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1013,7 +1352,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1016: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1021,7 +1360,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1024: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1037,42 +1376,42 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1040: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1044: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1050: 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:1052: 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:1054: 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=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:1073: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1075: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1083,26 +1422,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1095: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1098: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + + + + + + + + + + + + + + + + ac_aux_dir= for ac_dir in $global_top_srcdir ../..; do @@ -1121,7 +1457,7 @@ for ac_dir in $global_top_srcdir ../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1124: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $global_top_srcdir ../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1141,43 +1477,48 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1144: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$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 - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -1190,7 +1531,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1193: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1201,7 +1542,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1204: checking whether build environment is sane" >&5 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1225,7 +1566,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1228: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1238,13 +1579,13 @@ then # Ok. : else - { { echo "$as_me:1241: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1247: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1259,6 +1600,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` @@ -1269,15 +1611,15 @@ if eval "$MISSING --run true"; then else am_missing_run= am_backtick='`' - { echo "$as_me:1272: WARNING: ${am_backtick}missing' script is too old or missing" >&5 + { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} fi -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1280: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1285,41 +1627,44 @@ else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:1295: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1303: result: $AWK" >&5 + echo "$as_me:$LINENO: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1306: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -echo "$as_me:1313: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\EOF + cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then @@ -1330,11 +1675,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1333: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1337: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1349,6 +1694,7 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' @@ -1357,6 +1703,9 @@ else AMDEP_FALSE= fi + + + rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null if test -d .deps; then @@ -1367,10 +1716,11 @@ else fi rmdir .deps 2>/dev/null + # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1373: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1379,13 +1729,15 @@ fi PACKAGE=gettext_rpathz VERSION=0 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" -EOF +_ACEOF + -cat >>confdefs.h <>confdefs.h <<_ACEOF #define VERSION "$VERSION" -EOF +_ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. @@ -1398,18 +1750,24 @@ EOF # requests that it be used. This is a bit dumb. : ${OBJEXT=o} + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + AMTAR=${AMTAR-"${am_missing_run}tar"} install_sh=${install_sh-"$am_aux_dir/install-sh"} @@ -1427,7 +1785,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1430: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1435,25 +1793,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1445: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1453: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1456: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1462,7 +1823,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1465: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1470,25 +1831,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1480: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1488: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1491: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1501,7 +1865,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1504: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1509,25 +1873,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1519: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1527: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1530: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1536,7 +1903,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1539: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1544,25 +1911,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1554: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1562: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1565: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1575,7 +1945,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1578: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1584,19 +1954,22 @@ else ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1598: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done if test $ac_prog_rejected = yes; then @@ -1608,19 +1981,17 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1620: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1623: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1631,7 +2002,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1634: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1639,25 +2010,28 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1649: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1657: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1660: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1670,7 +2044,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1673: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1678,25 +2052,28 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1688: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1696: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1699: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1708,33 +2085,40 @@ fi fi -test -z "$CC" && { { echo "$as_me:1711: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1716:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1719: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1724: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1727: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1729: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1732: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1736 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1745,100 +2129,120 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1752: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1755: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1758: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1781: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1787: result: $ac_file" >&5 +echo "$as_me:$LINENO: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1792: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1798: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1801: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1808: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:1816: result: yes" >&5 +echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1823: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1825: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1828: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1830: \"$ac_link\"") >&5 +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1833: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1846,26 +2250,32 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1849: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1855: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1861: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1867 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1876,40 +2286,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1879: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1882: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1894: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1901: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1905: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1911 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1923,41 +2340,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1929: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1932: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1935: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1947: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1953: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1959 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -1968,26 +2390,27 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1974: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1977: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1980: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1990: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2004,6 +2427,102 @@ else CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2014,16 +2533,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2020: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2023: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2026: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -2035,8 +2554,12 @@ if { (eval echo "$as_me:2017: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 2038 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration int @@ -2048,27 +2571,32 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2054: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2057: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2060: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2070 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2079,21 +2607,22 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2085: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2088: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2091: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2106,7 +2635,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2115,7 +2645,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_commands="$ac_config_commands default-1" + ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2123,7 +2653,7 @@ doit: @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:2126: checking for style of include used by $am_make" >&5 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 am__include='#' am__quote= @@ -2150,13 +2680,15 @@ if test "$am__include" = "#"; then fi fi -echo "$as_me:2153: result: $_am_result" >&5 + +echo "$as_me:$LINENO: result: $_am_result" >&5 echo "${ECHO_T}$_am_result" >&6 rm -f confinc confmf + depcc="$CC" am_compiler_list= -echo "$as_me:2159: checking dependency style of $depcc" >&5 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2218,10 +2750,11 @@ else fi fi -echo "$as_me:2221: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -2290,11 +2823,11 @@ else fi; # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2293: error: cannot run $ac_config_sub" >&5 + { { 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:2297: checking build system type" >&5 +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 @@ -2303,23 +2836,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2306: error: cannot guess build type; you must specify one" >&5 + { { 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:2310: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { { 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:2315: result: $ac_cv_build" >&5 +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:2322: checking host system type" >&5 + +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 @@ -2328,18 +2862,19 @@ else 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:2331: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { 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:2336: result: $ac_cv_host" >&5 +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/'` + # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. if test "X${PATH_SEPARATOR+set}" != Xset; then @@ -2351,6 +2886,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then PATH_SEPARATOR=$lt_cv_sys_path_separator fi + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -2361,7 +2897,7 @@ fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:2364: checking for ld used by GCC" >&5 + 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*) @@ -2391,10 +2927,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:2394: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:2397: checking for non-GNU ld" >&5 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -2424,16 +2960,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:2427: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:2430: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:2433: error: no acceptable ld found in \$PATH" >&5 +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:2436: checking if the linker ($LD) is GNU ld" >&5 +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 "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2445,23 +2981,24 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:2448: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:2452: checking for $LD option to reload object files" >&5 + +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:2459: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:2464: checking for BSD-compatible nm" >&5 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2497,22 +3034,107 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:2500: result: $NM" >&5 +echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:2503: checking whether ln -s works" >&5 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_executable_p="test -f" +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_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" + fi + done + done +done + + # Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for _sed in $_sed_list /usr/xpg4/bin/sed; do + test ! -f ${_sed} && break + cat /dev/null > "$tmp/sed.in" + _count=0 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" + # Check for GNU sed and select it if it is found. + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then + lt_cv_path_SED=${_sed} + break + fi + while true; do + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" + mv "$tmp/sed.tmp" "$tmp/sed.in" + cp "$tmp/sed.in" "$tmp/sed.nl" + echo >>"$tmp/sed.nl" + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break + # 40000 chars as input seems more than enough + test $_count -gt 10 && break + _count=`expr $_count + 1` + if test $_count -gt $_max; then + _max=$_count + lt_cv_path_SED=$_sed + fi + done + done + rm -rf "$tmp" + +fi + +if test "X$SED" != "X"; then + lt_cv_path_SED=$SED +else + SED=$lt_cv_path_SED +fi +echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 + +echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2507: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2510: result: no, using $LN_S" >&5 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2514: checking how to recognise dependant libraries" >&5 -echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2589,9 +3211,9 @@ hpux10.20*|hpux11*) lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -irix5* | irix6*) +irix5* | irix6* | nonstopux*) case $host_os in - irix5*) + irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; @@ -2613,7 +3235,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -2684,18 +3306,28 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; esac ;; esac fi -echo "$as_me:2692: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method + + + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:2698: checking command to parse $NM output" >&5 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2731,9 +3363,12 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -irix*) +irix* | nonstopux*) symcode='[BCDEGRST]' ;; +osf*) + symcode='[BCDEGQRST]' + ;; solaris* | sysv5*) symcode='[BDT]' ;; @@ -2776,17 +3411,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:2779: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:2786: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:2789: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -2838,11 +3473,11 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:2841: \"$ac_link\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2844: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2882,10 +3517,10 @@ else fi if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; then - echo "$as_me:2885: result: failed" >&5 + echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:2888: result: ok" >&5 + echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi @@ -2894,7 +3529,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2897: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2915,18 +3550,22 @@ 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 2918 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:2923: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2929: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2940,7 +3579,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -2949,17 +3589,21 @@ 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 2952 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:2956: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2962: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2974,7 +3618,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -2996,7 +3641,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2999: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3006,18 +3651,60 @@ 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 3009 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Syntax error _ACEOF -if { (eval echo "$as_me:3014: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3020: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3027,88 +3714,345 @@ if { (eval echo "$as_me:3014: \"$ac_cpp conftest.$ac_ext\"") >&5 else ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.$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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else cat >conftest.$ac_ext <<_ACEOF -#line 3043 "configure" -#include "confdefs.h" -#include +#line $LINENO "configure" +/* confdefs.h. */ _ACEOF -if { (eval echo "$as_me:3047: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3053: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cpp_err=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:3081: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +done + + for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3095: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3101 "configure" -#include "confdefs.h" + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3105: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3111: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3119,29 +4063,80 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc 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 + ;; + 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: 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 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:3130: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done + + + + + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:3144: checking for ${ac_tool_prefix}file" >&5 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3196,16 +4191,16 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3199: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3202: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:3208: checking for file" >&5 + echo "$as_me:$LINENO: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3260,10 +4255,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:3263: result: $MAGIC_CMD" >&5 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:3266: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3279,7 +4274,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3282: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3287,25 +4282,28 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3297: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3305: result: $RANLIB" >&5 + echo "$as_me:$LINENO: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3308: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3314,7 +4312,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3317: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3322,15 +4320,18 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3332: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -3338,10 +4339,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3341: result: $ac_ct_RANLIB" >&5 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3344: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3353,7 +4354,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:3356: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3361,25 +4362,28 @@ else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:3371: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:3379: result: $STRIP" >&5 + echo "$as_me:$LINENO: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:3382: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3388,7 +4392,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:3391: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3396,15 +4400,18 @@ else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:3406: found $ac_dir/$ac_word" >&5 -break +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" @@ -3412,10 +4419,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:3415: result: $ac_ct_STRIP" >&5 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:3418: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3424,6 +4431,7 @@ else STRIP="$ac_cv_prog_STRIP" fi + enable_dlopen=no enable_win32_dll=no @@ -3439,11 +4447,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3442 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:3443: \"$ac_compile\"") >&5 + echo '#line 4450 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3446: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -3464,12 +4472,13 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:3467: checking whether the C compiler needs -belf" >&5 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3477,8 +4486,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 3480 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3489,21 +4502,22 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3492: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3495: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3498: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3501: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3514,7 +4528,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:3517: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -3522,6 +4536,7 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 fi ;; + esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -3614,7 +4629,7 @@ fi set dummy $CC compiler="$2" -echo "$as_me:3617: checking for objdir" >&5 +echo "$as_me:$LINENO: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -3625,9 +4640,11 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:3628: result: $objdir" >&5 +echo "$as_me:$LINENO: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 + + # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" @@ -3640,7 +4657,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:3643: checking for $compiler option to produce PIC" >&5 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3672,7 +4689,7 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -3715,7 +4732,7 @@ else lt_cv_prog_cc_pic='+Z' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. @@ -3772,11 +4789,7 @@ else sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' - if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' - else - lt_cv_prog_cc_wl='-Wl,' - fi + lt_cv_prog_cc_wl='-Wl,' ;; uts4*) @@ -3800,14 +4813,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:3803: result: none" >&5 + echo "$as_me:$LINENO: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:3806: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:3810: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3815,8 +4828,12 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 3818 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3827,16 +4844,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3830: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3833: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3836: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3839: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -3856,7 +4873,8 @@ if { (eval echo "$as_me:3830: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no fi @@ -3865,6 +4883,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi + if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= lt_cv_prog_cc_can_build_shared=no @@ -3872,23 +4891,23 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:3875: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:3881: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:3885: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi fi -echo "$as_me:3891: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3897,8 +4916,12 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 3900 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -3909,30 +4932,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3915: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3918: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3921: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi + # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:3935: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -3942,8 +4967,9 @@ link_static_flag="$lt_cv_prog_cc_static" no_builtin_flag="$lt_cv_prog_cc_no_builtin" can_build_shared="$lt_cv_prog_cc_can_build_shared" + # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:3946: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3963,7 +4989,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3987,12 +5013,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:3990: result: $compiler_c_o" >&5 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:3995: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4004,8 +5030,12 @@ else save_objext="$ac_objext" ac_objext=lo cat >conftest.$ac_ext <<_ACEOF -#line 4007 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4016,16 +5046,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4019: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4022: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4025: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4028: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4037,7 +5067,8 @@ if { (eval echo "$as_me:4019: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" @@ -4046,7 +5077,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:4049: result: $compiler_o_lo" >&5 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5 echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no @@ -4056,7 +5087,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:4059: checking if we can lock with hard links" >&5 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -4064,10 +5095,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:4067: result: $hard_links" >&5 + echo "$as_me:$LINENO: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:4070: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -4077,15 +5108,19 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:4080: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 4087 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4096,16 +5131,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4102: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4105: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4108: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4117,11 +5152,12 @@ if { (eval echo "$as_me:4099: \"$ac_compile\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:4124: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -4132,7 +5168,7 @@ echo "${ECHO_T}$compiler_rtti_exceptions" >&6 fi # See if the linker supports building shared libraries. -echo "$as_me:4135: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -4289,7 +5325,7 @@ EOF # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; @@ -4298,6 +5334,7 @@ EOF set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; @@ -4410,10 +5447,12 @@ else # need to do runtime linking. case $host_os in aix4.[23]|aix4.[23].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -4527,8 +5566,9 @@ else esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -4580,13 +5620,14 @@ else export_dynamic_flag_spec='${wl}-E' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='-rpath $libdir' fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; @@ -4614,7 +5655,7 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -4624,7 +5665,7 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac @@ -4736,13 +5777,23 @@ EOF ;; sysv4) - if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - else - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; @@ -4812,12 +5863,12 @@ EOF ;; esac fi -echo "$as_me:4815: result: $ld_shlibs" >&5 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo "$as_me:4820: checking how to hardcode library paths into programs" >&5 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -4841,20 +5892,20 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:4844: result: $hardcode_action" >&5 +echo "$as_me:$LINENO: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo "$as_me:4849: checking whether stripping libraries is possible" >&5 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:4854: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:4857: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4862,7 +5913,7 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics -echo "$as_me:4865: checking dynamic linker characteristics" >&5 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -4890,6 +5941,9 @@ aix3*) aix4* | aix5*) version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' @@ -4928,6 +5982,7 @@ aix4* | aix5*) fi shlibpath_var=LIBPATH fi + hardcode_into_libs=yes ;; amigaos*) @@ -4975,7 +6030,7 @@ cygwin* | mingw* | pw32*) ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' @@ -5070,14 +6125,17 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=irix +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) version_type=irix ;; + esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) @@ -5181,11 +6239,12 @@ os2*) osf3* | osf4* | osf5*) version_type=osf need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + hardcode_into_libs=yes ;; sco3.2v5*) @@ -5228,6 +6287,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in sni) shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no ;; motorola) need_lib_prefix=no @@ -5267,17 +6332,17 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:5270: result: $dynamic_linker" >&5 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo "$as_me:5275: checking if libtool supports shared libraries" >&5 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:5277: result: $can_build_shared" >&5 +echo "$as_me:$LINENO: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 -echo "$as_me:5280: checking whether to build shared libraries" >&5 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 test "$can_build_shared" = "no" && enable_shared=no @@ -5298,14 +6363,14 @@ aix4*) fi ;; esac -echo "$as_me:5301: result: $enable_shared" >&5 +echo "$as_me:$LINENO: result: $enable_shared" >&5 echo "${ECHO_T}$enable_shared" >&6 -echo "$as_me:5304: checking whether to build static libraries" >&5 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:5308: result: $enable_static" >&5 +echo "$as_me:$LINENO: result: $enable_static" >&5 echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then @@ -5343,25 +6408,40 @@ else ;; *) - echo "$as_me:5346: checking for shl_load" >&5 + echo "$as_me:$LINENO: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5352 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif int main () @@ -5380,31 +6460,32 @@ f = shl_load; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5383: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5386: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5389: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5392: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5402: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:5407: checking for shl_load in -ldld" >&5 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5412,8 +6493,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5415 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5431,50 +6516,66 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5434: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5437: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5440: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5443: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5454: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:5459: checking for dlopen" >&5 + echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5465 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif int main () @@ -5493,31 +6594,32 @@ f = dlopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5496: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5499: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5502: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5505: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5515: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:5520: checking for dlopen in -ldl" >&5 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5525,8 +6627,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5528 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5544,32 +6650,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5547: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5550: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5553: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5556: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5567: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:5572: checking for dlopen in -lsvld" >&5 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5577,8 +6684,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5580 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5596,32 +6707,33 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5599: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5602: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5605: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5608: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5619: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:5624: checking for dld_link in -ldld" >&5 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5629,8 +6741,12 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5632 "configure" -#include "confdefs.h" +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5648,40 +6764,46 @@ dld_link (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5651: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5654: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5657: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5660: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5671: result: $ac_cv_lib_dld_dld_link" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi + fi + fi + fi + fi + fi ;; @@ -5704,7 +6826,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:5707: checking whether a program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5715,7 +6837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5795,13 +6917,14 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5799: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:5804: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5812,7 +6935,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5879: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -5892,8 +7015,9 @@ EOF fi rm -fr conftest* + fi -echo "$as_me:5896: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -5914,6 +7038,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 esac fi + if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -5923,7 +7048,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:5926: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5931,10 +7056,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5937: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -5948,10 +7073,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:5951: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:5954: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -5966,7 +7091,7 @@ else fi - echo "$as_me:5969: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -5995,7 +7120,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS \ + for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ @@ -6057,8 +7182,11 @@ if test -f "$ltmain"; then # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# A sed that does not truncate output. +SED=$lt_SED + # Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" +Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6523,6 +7651,10 @@ EOF chmod +x "$ofile" fi + + + + # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -6531,6 +7663,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion + + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -6546,6 +7680,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" + # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" @@ -6553,10 +7688,23 @@ if test "${with_gnu_ld+set}" = set; then 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:6559: checking for ld used by GCC" >&5 + 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*) @@ -6586,10 +7734,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:6589: checking for GNU ld" >&5 + echo "$as_me:$LINENO: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:6592: checking for non-GNU ld" >&5 + 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 @@ -6619,16 +7767,16 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - echo "$as_me:6622: result: $LD" >&5 + echo "$as_me:$LINENO: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:6625: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:6628: error: no acceptable ld found in \$PATH" >&5 +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:6631: checking if the linker ($LD) is GNU ld" >&5 +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 @@ -6640,11 +7788,13 @@ else acl_cv_prog_gnu_ld=no fi fi -echo "$as_me:6643: result: $acl_cv_prog_gnu_ld" >&5 +echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 with_gnu_ld=$acl_cv_prog_gnu_ld - echo "$as_me:6647: checking for shared library run path origin" >&5 + + + 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 @@ -6657,7 +7807,7 @@ else acl_cv_rpath=done fi -echo "$as_me:6660: result: $acl_cv_rpath" >&5 +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6 wl="$acl_cv_wl" libext="$acl_cv_libext" @@ -6676,12 +7826,19 @@ else enable_rpath=yes fi; - echo "$as_me:6679: checking how to link with librpathx" >&5 + + + + + + echo "$as_me:$LINENO: checking how to link with librpathx" >&5 echo $ECHO_N "checking how to link with librpathx... $ECHO_C" >&6 if test "${ac_cv_librpathx_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -6695,6 +7852,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathx-prefix or --without-librpathx-prefix was given. if test "${with_librpathx_prefix+set}" = set; then withval="$with_librpathx_prefix" @@ -7062,7 +8220,7 @@ fi; ac_cv_librpathx_cppflags="$INCRPATHX" fi -echo "$as_me:7065: result: $ac_cv_librpathx_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathx_libs" >&5 echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 LIBRPATHX="$ac_cv_librpathx_libs" LTLIBRPATHX="$ac_cv_librpathx_ltlibs" @@ -7090,14 +8248,25 @@ echo "${ECHO_T}$ac_cv_librpathx_libs" >&6 fi done + + HAVE_LIBRPATHX=yes - echo "$as_me:7095: checking how to link with librpathy" >&5 + + + + + + + + echo "$as_me:$LINENO: checking how to link with librpathy" >&5 echo $ECHO_N "checking how to link with librpathy... $ECHO_C" >&6 if test "${ac_cv_librpathy_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + use_additional=yes acl_save_prefix="$prefix" @@ -7111,6 +8280,7 @@ else exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + # Check whether --with-librpathy-prefix or --without-librpathy-prefix was given. if test "${with_librpathy_prefix+set}" = set; then withval="$with_librpathy_prefix" @@ -7478,7 +8648,7 @@ fi; ac_cv_librpathy_cppflags="$INCRPATHY" fi -echo "$as_me:7481: result: $ac_cv_librpathy_libs" >&5 +echo "$as_me:$LINENO: result: $ac_cv_librpathy_libs" >&5 echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 LIBRPATHY="$ac_cv_librpathy_libs" LTLIBRPATHY="$ac_cv_librpathy_ltlibs" @@ -7506,9 +8676,14 @@ echo "${ECHO_T}$ac_cv_librpathy_libs" >&6 fi done + + HAVE_LIBRPATHY=yes -ac_config_files="$ac_config_files Makefile" + + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -7519,7 +8694,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -7554,7 +8729,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -7590,7 +8765,7 @@ fi # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\EOF +cat >confdef2opt.sed <<\_ACEOF t clear : clear s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g @@ -7604,7 +8779,7 @@ s,\[,\\&,g s,\],\\&,g s,\$,$$,g p -EOF +_ACEOF # We use echo to avoid assuming a particular line-breaking character. # The extra dot is to prevent the shell from consuming trailing # line-breaks from the sub-command output. A line-break within @@ -7615,35 +8790,228 @@ ac_LF_and_DOT=`echo; echo .` DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f confdef2opt.sed + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:7621: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + # Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -7669,24 +9037,20 @@ else fi rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: else - as_unset=false + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +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" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + # IFS # We need space, tab and new line, in precisely that order. @@ -7695,10 +9059,34 @@ as_nl=' IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH exec 6>&1 +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by $as_me, which was +generated by GNU Autoconf 2.56. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF # Files that config.status was made for. @@ -7718,7 +9106,7 @@ if test -n "$ac_config_commands"; then echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -7728,6 +9116,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -7740,12 +9129,12 @@ Configuration commands: $config_commands Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.56, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -7754,9 +9143,9 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -7766,30 +9155,30 @@ do --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7792: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -7799,16 +9188,19 @@ Try \`$0 --help' for more information." >&2;} --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:7811: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -7820,25 +9212,23 @@ Try \`$0 --help' for more information." >&2;} shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi _ACEOF -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # INIT-COMMANDS section. # @@ -7846,16 +9236,18 @@ cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - *) { { echo "$as_me:7858: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7870,6 +9262,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -7878,23 +9273,23 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -7907,6 +9302,12 @@ if test -n "\$CONFIG_FILES"; then sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -7922,19 +9323,13 @@ s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t @@ -7980,17 +9375,20 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBRPATHX@,$LIBRPATHX,;t t s,@LTLIBRPATHX@,$LTLIBRPATHX,;t t s,@LIBRPATHY@,$LIBRPATHY,;t t s,@LTLIBRPATHY@,$LTLIBRPATHY,;t t s,@global_top_srcdir@,$global_top_srcdir,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -8029,8 +9427,8 @@ EOF fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -8044,7 +9442,8 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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\(/\)' \| \ @@ -8055,60 +9454,84 @@ echo X"$ac_file" | /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" else - ac_dir_suffix= ac_dots= - fi + 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; }; }; } - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + 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_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:8103: creating $ac_file" >&5 + { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -8118,7 +9541,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:8121: error: cannot find input file: $f" >&5 + 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;; @@ -8131,23 +9554,29 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:8134: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -8159,8 +9588,8 @@ s,@INSTALL@,$ac_INSTALL,;t t fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_COMMANDS section. @@ -8168,7 +9597,53 @@ cat >>$CONFIG_STATUS <<\EOF 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'` + 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 +# 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` + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in default-1 ) test x"$AMDEP_TRUE" != x"" || @@ -8211,15 +9686,16 @@ done ;; esac done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -8230,8 +9706,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction.